@smoothbricks/cli 0.4.1 → 0.4.2

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

package/dist/monorepo/managed-files.js

@@ -6,6 +6,11 @@ import { listReleasePackages, readPackageJson } from '../lib/workspace.js';
 import { renderCiWorkflowYaml } from './ci-workflow.js';
 import { renderPublishWorkflowYaml } from './publish-workflow.js';
 const managedFiles = [
+    {
+        kind: 'raw',
+        source: 'envrc',
+        target: '.envrc',
+    },
     {
         kind: 'raw',
         source: 'tooling/direnv/repo-path',
@@ -18,6 +23,12 @@ const managedFiles = [
         target: 'tooling/direnv/github-actions-bootstrap.sh',
         executable: true,
     },
+    {
+        kind: 'raw',
+        source: 'tooling/direnv/setup-environment.ts',
+        target: 'tooling/direnv/setup-environment.ts',
+        executable: true,
+    },
     {
         kind: 'raw',
         source: 'tooling/git-hooks/pre-commit.sh',

package/dist/monorepo/packs/index.js

@@ -296,6 +296,8 @@ async function readResolvedTargetsByProject(ctx) {
         {
             targets: new Set(project.targets),
             ...(project.buildDependsOn ? { buildDependsOn: project.buildDependsOn } : {}),
+            ...(project.targetExecutors ? { targetExecutors: project.targetExecutors } : {}),
+            ...(project.targetScripts ? { targetScripts: project.targetScripts } : {}),
         },
     ]));
 }

package/dist/nx/index.d.ts

@@ -2,6 +2,8 @@ export interface ProjectTargets {
     project: string;
     targets: string[];
     buildDependsOn?: string[];
+    targetExecutors?: Map<string, string>;
+    targetScripts?: Map<string, string>;
 }
 export interface CommandInvocation {
     command: string;
@@ -12,6 +14,8 @@ export declare function nxShowProjectCommand(project: string): CommandInvocation
 export declare function nxCacheDirectories(root: string): string[];
 export declare function targetNamesFromNxProjectJson(value: unknown): string[];
 export declare function buildDependsOnFromNxProjectJson(value: unknown): string[] | undefined;
+export declare function targetExecutorsFromNxProjectJson(value: unknown): Map<string, string>;
+export declare function targetScriptsFromNxProjectJson(value: unknown): Map<string, string>;
 export declare function formatProjectTargetLines(projects: ProjectTargets[]): string;
 export declare function projectNamesWithTarget(projects: ProjectTargets[], target: string): string[];
 export declare function projectNamesFromNxShowProjectsOutput(output: string): string[];

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nx/index.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,wBAAgB,cAAc,IAAI,iBAAiB,CAElD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAEzD;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAGrE;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAOpF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAK3E;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAK3F;AAED,wBAAgB,oCAAoC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAsB7E;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7D;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5D;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAGhF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nx/index.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,wBAAgB,cAAc,IAAI,iBAAiB,CAElD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAEzD;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAGrE;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAOpF;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAYpF;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBlF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAK3E;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAK3F;AAED,wBAAgB,oCAAoC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAsB7E;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK7D;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5D;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAa5D;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAGhF"}

package/dist/nx/index.js

@@ -25,6 +25,36 @@ export function buildDependsOnFromNxProjectJson(value) {
     }
     return build.dependsOn;
 }
+export function targetExecutorsFromNxProjectJson(value) {
+    const targets = isRecord(value) ? recordProperty(value, 'targets') : null;
+    const executors = new Map();
+    if (!targets) {
+        return executors;
+    }
+    for (const [targetName, target] of Object.entries(targets)) {
+        if (isRecord(target) && typeof target.executor === 'string') {
+            executors.set(targetName, target.executor);
+        }
+    }
+    return executors;
+}
+export function targetScriptsFromNxProjectJson(value) {
+    const targets = isRecord(value) ? recordProperty(value, 'targets') : null;
+    const scripts = new Map();
+    if (!targets) {
+        return scripts;
+    }
+    for (const [targetName, target] of Object.entries(targets)) {
+        if (!isRecord(target)) {
+            continue;
+        }
+        const options = recordProperty(target, 'options');
+        if (typeof options?.script === 'string') {
+            scripts.set(targetName, options.script);
+        }
+    }
+    return scripts;
+}
 export function formatProjectTargetLines(projects) {
     return projects
         .flatMap((project) => project.targets.map((target) => `${project.project}:${target}`))
@@ -108,5 +138,7 @@ async function readProjectTarget(root, project) {
         project,
         targets: targetNamesFromNxProjectJson(parsed),
         buildDependsOn: buildDependsOnFromNxProjectJson(parsed),
+        targetExecutors: targetExecutorsFromNxProjectJson(parsed),
+        targetScripts: targetScriptsFromNxProjectJson(parsed),
     };
 }

package/managed/raw/envrc

@@ -0,0 +1,18 @@
+# Worktrees inherit the real project .envrc once, then stop. The same file is
+# checked out inside .jcode-worktrees, so continuing after source_up_if_exists
+# would run the devenv setup twice while sandbox blocks access to tooling/.
+case "$PWD" in
+  */.jcode-worktrees/*)
+    ;;
+  *)
+    source_up_if_exists
+    ;;
+esac
+
+watch_file tooling/direnv/envrc.sh
+
+cd tooling/direnv
+. envrc.sh
+
+# Load local extensions and overrides
+source_env_if_exists .envrc-local

package/managed/raw/tooling/direnv/setup-environment.ts

@@ -0,0 +1,131 @@
+#!/usr/bin/env bun
+import { existsSync } from 'node:fs';
+import { mkdir, rmdir } from 'node:fs/promises';
+import path from 'node:path';
+import { $ } from 'bun';
+
+const devenvRoot = process.env.DEVENV_ROOT;
+const projectRoot = path.resolve(`${devenvRoot}/../..`);
+const startedWithoutNodeModules = !existsSync(path.join(projectRoot, 'node_modules'));
+
+class CapturedCommandError extends Error {
+  constructor(
+    public readonly command: string,
+    public readonly exitCode: number,
+    public readonly stdout: Uint8Array,
+    public readonly stderr: Uint8Array,
+  ) {
+    super(`${command} failed with exit code ${exitCode}`);
+  }
+}
+
+// Go to project root
+process.chdir(projectRoot);
+
+try {
+  // Install dependencies first so node_modules/.bin tools are available
+  if (process.env.CI) {
+    try {
+      await runSetupCommand('bun install --frozen-lockfile', $`bun install --frozen-lockfile`, { quiet: false });
+    } catch (error) {
+      console.error('! Failed to install dependencies with frozen lockfile');
+      replayCapturedOutput(error);
+      await runSetupCommand('bun install', $`bun install`, { quiet: false });
+      console.error('git diff after install:');
+      await runSetupCommand('git diff', $`git diff`, { quiet: false, allowNonzero: true });
+      process.exit(1);
+    }
+  } else {
+    await installLocalDependencies();
+  }
+
+  // Bun selects its resolver mode at process startup. If this process started
+  // before node_modules existed, imports below can stay in auto-install mode
+  // even after bun install succeeds, so restart once into the real workspace.
+  if (startedWithoutNodeModules) {
+    await runSetupCommand('restart setup-environment.ts', $`bun --no-install ${import.meta.path}`, { quiet: false });
+    process.exit(0);
+  }
+
+  if (!process.env.CI) {
+    const { syncRootRuntimeVersions } = await import('@smoothbricks/cli/monorepo/runtime');
+    await syncRootRuntimeVersions(projectRoot);
+  }
+
+  const { applyWorkspaceGitConfig } = await import('@smoothbricks/cli/monorepo/git-config');
+  await applyWorkspaceGitConfig(projectRoot);
+} catch (error) {
+  if (error instanceof CapturedCommandError) {
+    console.error(`--- ERROR: setup-environment.ts failed while running: ${error.command}`);
+    console.error(`exit code: ${error.exitCode}`);
+  } else {
+    console.error(`--- ERROR: setup-environment.ts failed: ${error}`);
+  }
+  replayCapturedOutput(error);
+  console.error('\n---');
+  process.exit(1);
+}
+
+async function installLocalDependencies(): Promise<void> {
+  // bun install runs the root prepare script, which patches TypeScript with
+  // ts-patch. Multiple concurrent direnv activations can otherwise race while
+  // mutating the same files under node_modules.
+  await withSetupLock(async () => {
+    await runSetupCommand('bun install --no-summary', $`bun install --no-summary`);
+  });
+}
+
+async function runSetupCommand(
+  command: string,
+  shell: ReturnType<typeof $>,
+  options: { quiet?: boolean; allowNonzero?: boolean } = {},
+): Promise<void> {
+  const result = await shell
+    .quiet(options.quiet ?? true)
+    .nothrow()
+    .cwd(projectRoot);
+  if (result.exitCode !== 0 && options.allowNonzero !== true) {
+    throw new CapturedCommandError(command, result.exitCode, result.stdout, result.stderr);
+  }
+}
+
+async function withSetupLock<T>(fn: () => Promise<T>): Promise<T> {
+  const lockDir = path.join(projectRoot, 'tooling/direnv/.devenv/setup-environment.lock');
+  await acquireLock(lockDir);
+  try {
+    return await fn();
+  } finally {
+    await rmdir(lockDir).catch(() => undefined);
+  }
+}
+
+async function acquireLock(lockDir: string): Promise<void> {
+  const deadline = Date.now() + 120_000;
+  while (true) {
+    try {
+      await mkdir(lockDir, { recursive: false });
+      return;
+    } catch (error) {
+      if (!isFileExistsError(error) || Date.now() > deadline) {
+        throw error;
+      }
+      await Bun.sleep(100);
+    }
+  }
+}
+
+function isFileExistsError(error: unknown): boolean {
+  return error instanceof Error && 'code' in error && error.code === 'EEXIST';
+}
+
+function replayCapturedOutput(error: unknown): void {
+  if (!(error instanceof CapturedCommandError)) {
+    return;
+  }
+  if (error.stdout.length > 0) {
+    process.stdout.write(error.stdout);
+  }
+  if (error.stderr.length > 0) {
+    process.stderr.write(error.stderr);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {
@@ -45,7 +45,7 @@
   ],
   "dependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
-    "@smoothbricks/nx-plugin": "0.2.4",
+    "@smoothbricks/nx-plugin": "0.2.5",
     "@smoothbricks/validation": "0.1.1",
     "commander": "^14.0.3",
     "publint": "^0.3.18",

package/src/monorepo/managed-files.ts

@@ -38,6 +38,11 @@ interface DeployTargetInfo {
 }
 
 const managedFiles: ManagedFile[] = [
+  {
+    kind: 'raw',
+    source: 'envrc',
+    target: '.envrc',
+  },
   {
     kind: 'raw',
     source: 'tooling/direnv/repo-path',
@@ -50,6 +55,12 @@ const managedFiles: ManagedFile[] = [
     target: 'tooling/direnv/github-actions-bootstrap.sh',
     executable: true,
   },
+  {
+    kind: 'raw',
+    source: 'tooling/direnv/setup-environment.ts',
+    target: 'tooling/direnv/setup-environment.ts',
+    executable: true,
+  },
   {
     kind: 'raw',
     source: 'tooling/git-hooks/pre-commit.sh',

package/src/monorepo/packs/index.ts

@@ -395,6 +395,8 @@ async function readResolvedTargetsByProject(ctx: MonorepoContext): Promise<Map<s
       {
         targets: new Set(project.targets),
         ...(project.buildDependsOn ? { buildDependsOn: project.buildDependsOn } : {}),
+        ...(project.targetExecutors ? { targetExecutors: project.targetExecutors } : {}),
+        ...(project.targetScripts ? { targetScripts: project.targetScripts } : {}),
       },
     ]),
   );

package/src/nx/index.ts

@@ -9,6 +9,8 @@ export interface ProjectTargets {
   project: string;
   targets: string[];
   buildDependsOn?: string[];
+  targetExecutors?: Map<string, string>;
+  targetScripts?: Map<string, string>;
 }
 
 export interface CommandInvocation {
@@ -42,6 +44,38 @@ export function buildDependsOnFromNxProjectJson(value: unknown): string[] | unde
   return build.dependsOn;
 }
 
+export function targetExecutorsFromNxProjectJson(value: unknown): Map<string, string> {
+  const targets = isRecord(value) ? recordProperty(value, 'targets') : null;
+  const executors = new Map<string, string>();
+  if (!targets) {
+    return executors;
+  }
+  for (const [targetName, target] of Object.entries(targets)) {
+    if (isRecord(target) && typeof target.executor === 'string') {
+      executors.set(targetName, target.executor);
+    }
+  }
+  return executors;
+}
+
+export function targetScriptsFromNxProjectJson(value: unknown): Map<string, string> {
+  const targets = isRecord(value) ? recordProperty(value, 'targets') : null;
+  const scripts = new Map<string, string>();
+  if (!targets) {
+    return scripts;
+  }
+  for (const [targetName, target] of Object.entries(targets)) {
+    if (!isRecord(target)) {
+      continue;
+    }
+    const options = recordProperty(target, 'options');
+    if (typeof options?.script === 'string') {
+      scripts.set(targetName, options.script);
+    }
+  }
+  return scripts;
+}
+
 export function formatProjectTargetLines(projects: ProjectTargets[]): string {
   return projects
     .flatMap((project) => project.targets.map((target) => `${project.project}:${target}`))
@@ -135,5 +169,7 @@ async function readProjectTarget(root: string, project: string): Promise<Project
     project,
     targets: targetNamesFromNxProjectJson(parsed),
     buildDependsOn: buildDependsOnFromNxProjectJson(parsed),
+    targetExecutors: targetExecutorsFromNxProjectJson(parsed),
+    targetScripts: targetScriptsFromNxProjectJson(parsed),
   };
 }