@tdk-landscape/tdk-cli-core 1.3.145 → 1.3.147

package/engine/topologies/platform/docker/build/golden_image_dockerfile.star

@@ -38,13 +38,16 @@ def generate_golden_dockerfile():
 # This Dockerfile builds 8 golden images:
 #   - """ + prefix + """-l1:latest - OS base + Bun runtime
 #   - """ + prefix + """-l2:latest - Dependencies installed
-#   - """ + prefix + """-l3-backend:latest - Backend build tools (Prisma, no Infisical CLI)
+#   - """ + prefix + """-l3-backend:latest - Backend and migrator build tools (Prisma, no Infisical CLI)
 #   - """ + prefix + """-l3-frontend:latest - Frontend build tools (no Prisma)
-#   - """ + prefix + """-l3-migrator:latest - Migrator build tools (Prisma, no Infisical CLI)
-#   - """ + prefix + """-l4-backend:latest - Backend production runtime
+#   - """ + prefix + """-l4-backend:latest - Backend production runtime (Bun)
+#   - """ + prefix + """-l4-backend-node:latest - Backend production runtime (Node.js)
 #   - """ + prefix + """-l4-frontend:latest - Frontend production runtime (Nginx)
 #   - """ + prefix + """-l4-migrator:latest - Migrator production runtime
 #
+# Migrators build on l3-backend: a separate l3-migrator stage installed the same Prisma
+# and produced identical layers under a second image name.
+#
 # Services use these as base images to skip heavy dependency installation.
 #
 # ⚠️ SKIP_INFISICAL_SETUP Support:
@@ -139,28 +142,6 @@ LABEL layer="l3-frontend" \
 RUN echo "Bun version: $(bun --version)"
 
 
-# =============================================================================
-# L3-MIGRATOR: MIGRATOR BUILD TOOLS (PRISMA)
-# =============================================================================
-FROM l2_golden AS l3_migrator_golden
-
-LABEL layer="l3-migrator" \
-      description="Migrator build tools with Prisma" \
-      maintainer="{prefix}"
-
-# Install Prisma CLI globally (required for migrations, pinned)
-RUN bun add -g prisma@7.5.0 @prisma/client@7.5.0
-
-# Verify Prisma installation
-RUN echo "Prisma version: $(bunx prisma --version | head -1)"
-
-# ⚠️ CRITICAL: Infisical CLI is NOT installed in golden L3 images
-# Reason: curl to dl.cloudsmith.io hangs during Docker builds when CDN is slow
-# Solution: Use SKIP_INFISICAL_SETUP=1 build arg or runtime env var injection
-# Services read secrets from environment variables at runtime (no CLI needed)
-# See: .tilt/topologies/platform/docker/layers/l3_builder_layers.star
-
-
 # =============================================================================
 # L4-BACKEND-BUN: BACKEND PRODUCTION RUNTIME (BUN)
 # =============================================================================
@@ -256,8 +237,8 @@ LABEL layer="l4-migrator" \
 
 ENV NODE_ENV=production
 
-# Copy global Prisma installation from L3
-COPY --from=l3_migrator_golden /root/.bun/install/global /root/.bun/install/global
+# Copy global Prisma installation from L3 (l3-backend carries the same pinned Prisma)
+COPY --from=l3_backend_golden /root/.bun/install/global /root/.bun/install/global
 
 # ⚠️ Infisical CLI is NOT included in golden L4 images
 # The migrator reads secrets directly from environment variables at runtime

package/engine/topologies/platform/docker/layers/l3_builder_layers.star

@@ -172,8 +172,10 @@ def L3_generate_frontend_builder(res_path, build_cmd = RUNTIME_CONFIG["bun"]["ba
     # Args passed after the script name are appended to the end of the script
     # command, so they reach `vite build` while any preceding steps in the
     # script (e.g. `tsc --noEmit &&`) still run.
+    # A build script that already names a config (the CLI scaffold does) keeps its own; a second --config is not added.
+    config_flag = "" if "--config" in build_cmd else " --config " + AUTOGENERATED_CONFIG_PATHS['vite_build']
     parts.append(
-        "RUN " + build_cmd + " --config " + AUTOGENERATED_CONFIG_PATHS['vite_build'] + "\n"
+        "RUN " + build_cmd + config_flag + "\n"
     )
     return "".join(parts)
 

package/engine/topologies/platform/docker/layers/prisma/constants.star

@@ -83,7 +83,8 @@ def _load_golden_prefix():
 
 _GOLDEN_PREFIX = _load_golden_prefix()
 
-DEFAULT_GOLDEN_L3_MIGRATOR_IMAGE = _GOLDEN_PREFIX + "-l3-migrator:latest"
+# Migrators build on l3-backend; the golden build no longer makes a separate l3-migrator image.
+DEFAULT_GOLDEN_L3_MIGRATOR_IMAGE = _GOLDEN_PREFIX + "-l3-backend:latest"
 DEFAULT_GOLDEN_L4_MIGRATOR_IMAGE = _GOLDEN_PREFIX + "-l4-migrator:latest"
 
 DEFAULT_DB_PORT = "5432"

package/engine/topologies/tilt/resources/build_concurrency.star

@@ -0,0 +1,56 @@
+# =============================================================================
+# 🏗️ TILT SDK - BUILD CONCURRENCY
+# =============================================================================
+# Sets Tilt's maximum parallel updates from the Docker engine's CPU count and
+# memory, instead of Tilt's default, so a warm `tdk up` on a machine with spare
+# capacity builds more than three images at once.
+#
+# Override with TDK_MAX_PARALLEL_BUILDS=<positive integer>.
+# =============================================================================
+
+MIN_PARALLEL_BUILDS = 3
+MAX_PARALLEL_BUILDS = 8
+# CPUs kept free for Tilt, the Traefik/Postgres containers and the host.
+RESERVED_CPUS = 2
+# Rough peak memory per concurrent image build (Vite and tsc dominate).
+BUILD_MEMORY_BUDGET_BYTES = 1610612736  # 1.5 GiB
+
+
+def _is_positive_int(text):
+    return len(text) > 0 and text.isdigit() and int(text) > 0
+
+
+def _engine_resources():
+    """Returns (cpus, memory_bytes) from `docker info`, or None when unavailable."""
+    out = str(local(
+        "docker info --format '{{.NCPU}} {{.MemTotal}}' 2>/dev/null || true",
+        quiet=True,
+        echo_off=True,
+    )).strip()
+    parts = out.split(' ')
+    if len(parts) != 2 or not parts[0].isdigit() or not parts[1].isdigit():
+        return None
+    return (int(parts[0]), int(parts[1]))
+
+
+def compute_max_parallel_builds(cpus, memory_bytes):
+    """The concurrency for an engine with `cpus` CPUs and `memory_bytes` of memory."""
+    by_cpu = cpus - RESERVED_CPUS
+    by_memory = memory_bytes // BUILD_MEMORY_BUDGET_BYTES
+    return max(MIN_PARALLEL_BUILDS, min(MAX_PARALLEL_BUILDS, min(by_cpu, by_memory)))
+
+
+def configure_build_concurrency():
+    """Calls update_settings once with the chosen max_parallel_updates. Call at Tiltfile load."""
+    override = os.environ.get('TDK_MAX_PARALLEL_BUILDS', '').strip()
+    if _is_positive_int(override):
+        value = int(override)
+        print("🧮 Parallel builds: " + str(value) + " (TDK_MAX_PARALLEL_BUILDS)")
+    else:
+        resources = _engine_resources()
+        if resources == None:
+            print("🧮 Parallel builds: Tilt default (docker info unavailable, so the engine's CPU and memory could not be read)")
+            return
+        value = compute_max_parallel_builds(resources[0], resources[1])
+        print("🧮 Parallel builds: " + str(value) + " (from Docker engine: " + str(resources[0]) + " CPUs)")
+    update_settings(max_parallel_updates=value)

package/engine/topologies/tilt/resources/infra-loader.star

@@ -21,6 +21,7 @@
 # =============================================================================
 
 load("../common/utils_debug.star", "debug_log")
+load("./build_concurrency.star", "configure_build_concurrency")
 load("../../platform/docker/constants.star", "PlatformDockerConstants")
 load("../../platform/docker/compose/traefik_standalone.star", "generate_standalone_traefik_compose")
 load("../../platform/docker/networking/sablier_container_cycle.star", "sablier_middleware_suffix")
@@ -442,6 +443,9 @@ def load_all_infrastructure(should_enable, fix_docker_networks_fn=None, docker_p
     if should_enable('monitoring') and should_enable('elk'):
         fail("Incompatible flags: 'monitoring' and 'elk' cannot both be enabled at the same time. Disable one of them.")
 
+    # Size Tilt's parallel image builds to the Docker engine before any build is queued
+    configure_build_concurrency()
+
     # Build golden image before other infrastructure (if enabled)
     golden_image_resource = None
     if docker_provider and write_fn:

package/engine/topologies/tilt/resources/orchestrator/apply_compose_resource_registration.star

@@ -11,6 +11,7 @@ OUTPUT = struct(AUTOGENERATED_FOLDER = ".autogenerated")
 
 load("../../common/utils_debug.star", "debug_log")
 load('../../../platform/docker/index.star', 'Docker')
+load('../../../platform/docker/build/frontend_build_plan.star', 'frontend_build_plan')
 load('../../../platform/docker/constants.star', 'PlatformDockerConstants')
 load('../../../tilt/manifest/constants.star', 'BASE_PORT_FRONTEND', 'BASE_PORT_BACKEND')
 load('../../../platform/docker/networking/traefik_static_routes.star', 'generate_static_wake_route', 'normalize_abs_path')
@@ -575,11 +576,29 @@ def _should_skip_frontend(res, should_enable):
     return res.get('frontend', False) and should_enable('backends-only')
 
 
-def _process_frontend_resource(res, manifest, full_res_path, resource_path, resource_name, should_enable):
+def _register_frontend_typecheck(res, service_dir, typecheck_cmd):
+    """Non-blocking `<service>-typecheck` resource: runs the planned tsc command so type errors show in Tilt without gating the image.
+
+    The command runs on the host, so TypeScript must resolve from the service directory (`bun install`, at the
+    service or workspace root). Without it the resource fails with that instruction instead of a bare module error.
+    """
+    local_resource(
+        name=res['name'] + '-typecheck',
+        cmd="cd '" + service_dir + "' && { bunx tsc --version >/dev/null 2>&1 || { echo 'typecheck needs host dependencies: run bun install in " + service_dir + "'; exit 1; }; } && " + typecheck_cmd,
+        deps=[service_dir + '/src', service_dir + '/tsconfig.json'],
+        labels=['app.' + res['name'], 'typecheck'],
+        # tsc --noEmit writes no files, so it can run alongside the image builds.
+        allow_parallel=True,
+    )
+
+
+def _process_frontend_resource(res, manifest, full_res_path, resource_path, resource_name, should_enable, project_root=''):
     """Process a frontend resource and return compose entry."""
     target_path = res.get('target_path', manifest.get('target_path', '/usr/share/nginx/html'))
     use_nginx = 'nginx' in target_path or target_path == '/usr/share/nginx/html'
     port = res.get('port', manifest.get('port', BASE_PORT_FRONTEND))
+    service_dir = (project_root.rstrip('/') + '/' if project_root else '') + full_res_path
+    plan = frontend_build_plan(service_dir + '/package.json')
     Docker.frontend(
         res_path=full_res_path,
         resource_name=res['name'],
@@ -587,7 +606,10 @@ def _process_frontend_resource(res, manifest, full_res_path, resource_path, reso
         target_path=target_path,
         use_nginx=use_nginx,
         use_golden=should_enable('golden-image'),
+        build_cmd=plan['build_cmd'],
     )
+    if plan['typecheck']:
+        _register_frontend_typecheck(res, service_dir, plan['typecheck_cmd'])
     return Docker.frontend_compose(resource_path=resource_path, resource_name=resource_name, res=res, manifest=manifest)
 
 
@@ -735,7 +757,7 @@ def register_compose_resources(resource_config, ctx, runtime_flags, manifest_sta
             continue
         
         if res.get('frontend', False):
-            entry = _process_frontend_resource(res, manifest, full_res_path, resource_path, resource_name, should_enable)
+            entry = _process_frontend_resource(res, manifest, full_res_path, resource_path, resource_name, should_enable, ctx.get('project_root', ''))
         else:
             entry = _process_backend_resource(res, manifest, full_res_path, resource_path, resource_name, should_enable)
             # A deferStart resource has no container Traefik can discover via

package/engine/topologies/tilt/resources/orchestrator/generators/manifest_resource.star

@@ -32,6 +32,7 @@ load('../../../generators/nginx_conf.star', 'Nginx')
 load('../../../generators/api_gateway.star', 'ApiGateway')
 load('../../../generators/tsconfig.star', 'TSConfig')
 load('../../../../platform/docker/index.star', 'Docker')
+load('../../../../platform/docker/build/frontend_build_plan.star', 'frontend_build_plan')
 load('../../../generators/npmrc.star', 'PackageConfig')
 load('../../libs.star', 'Libs')
 load('./env.star', 'EnvGenerators')
@@ -371,13 +372,16 @@ def _generate_all_configs_for_resource(
         target_path = resource_config.get('target_path', '/usr/share/nginx/html')
         use_nginx = 'nginx' in target_path or target_path == '/usr/share/nginx/html'
         port = resource_config.get('port', manifest.get('port', BASE_PORT_FRONTEND))
+        root = ctx.get('project_root', '')
+        plan = frontend_build_plan((root.rstrip('/') + '/' if root else '') + resource_path + '/package.json')
         dockerfile_content = Docker.frontend(
             res_path=resource_path,
             resource_name=resource_config['name'],
             port=port,
             target_path=target_path,
             use_nginx=use_nginx,
-            use_golden=should_enable('golden-image')
+            use_golden=should_enable('golden-image'),
+            build_cmd=plan['build_cmd'],
         )
     elif provider_owned:
         dockerfile_content = Docker.backend_language(

package/engine/topologies/tilt/resources/watchers.star

@@ -89,14 +89,14 @@ def setup_utility_resources():
     )
     
     local_resource('prune-images',
-        cmd='./.tdk/.tdk-out/ext/assets/scripts/cleanup-tilt-images.sh --keep 0 --force && docker image prune -f',
+        cmd='./.tdk/.tdk-out/tdk-cli-ext/engine/assets/scripts/cleanup-tilt-images.sh --keep 0 --force && docker image prune -f',
         resource_deps=[],
         labels=['dev.maintenance'],
         auto_init=False
     )
 
     local_resource('memory-optimizer',
-        cmd='./.tdk/.tdk-out/ext/assets/scripts/mac-m1-resource-monitor.sh && ./.tdk/.tdk-out/ext/assets/scripts/cleanup-tilt-images.sh --keep 0 --force && docker image prune -f && docker builder prune -af --filter "until=24h"',
+        cmd='./.tdk/.tdk-out/tdk-cli-ext/engine/assets/scripts/mac-m1-resource-monitor.sh && ./.tdk/.tdk-out/tdk-cli-ext/engine/assets/scripts/cleanup-tilt-images.sh --keep 0 --force && docker image prune -f && docker builder prune -af --filter "until=24h"',
         resource_deps=[],
         labels=['dev.maintenance', 'mac-m1'],
         auto_init=False
@@ -121,12 +121,15 @@ def setup_utility_resources():
                 else
                     echo "$(date +%H:%M:%S) ✓ $count dangling images (threshold: 5)"
                 fi
+                # Tilt tags every build as tilt-<hash>, so superseded builds stay tagged
+                # and are never dangling. Keep the newest 2 per service; running images are skipped.
+                ./.tdk/.tdk-out/tdk-cli-ext/engine/assets/scripts/cleanup-tilt-images.sh --keep 2 --force >/dev/null 2>&1 || true
                 sleep 300
             done
         ''',
         resource_deps=[],
         labels=['dev.maintenance', 'mac-m1'],
-        auto_init=False,
+        auto_init=True,
     )
 
     # Continuously reclaim heavyweight migrator images once migration succeeds.
@@ -134,7 +137,7 @@ def setup_utility_resources():
         serve_cmd='''
             echo "🧹 Migrator image cleanup started (every 45s)"
             while true; do
-                ./.tdk/.tdk-out/ext/assets/scripts/cleanup-completed-migrator-images.sh || true
+                ./.tdk/.tdk-out/tdk-cli-ext/engine/assets/scripts/cleanup-completed-migrator-images.sh || true
                 sleep 45
             done
         ''',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdk-landscape/tdk-cli-core",
-  "version": "1.3.145",
+  "version": "1.3.147",
   "description": "TDK CLI — start services on your machine.",
   "homepage": "https://tdk-landscape.github.io/tdk-website",
   "repository": {