@tdk-landscape/tdk-cli-core 1.3.136 → 1.3.137

package/cli/dist-bundle/{cold-preflight-NXFER2W6.js → cold-preflight-UATSRM67.js}

@@ -1,2 +1,2 @@
 import{createRequire as __tdkRequire}from'node:module';const require=__tdkRequire(import.meta.url);
-import{ib as a,jb as b,kb as c,lb as d,mb as e}from"./chunk-I63IBPUZ.js";import"./chunk-OBQS5CYC.js";import"./chunk-6EA4DGCY.js";export{e as assertMachineReadyOrExit,d as formatColdPreflight,a as nodeTooOld,b as requireVerifiedDockerVersions,c as runColdPreflight};
+import{mb as a,nb as b,ob as c,pb as d,qb as e}from"./chunk-DUOGIS2Y.js";import"./chunk-OBQS5CYC.js";import"./chunk-6EA4DGCY.js";export{e as assertMachineReadyOrExit,d as formatColdPreflight,a as nodeTooOld,b as requireVerifiedDockerVersions,c as runColdPreflight};

package/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdk-cli-internal",
   "private": true,
-  "version": "1.3.136",
+  "version": "1.3.137",
   "description": "TDK CLI — start services on your laptop.",
   "keywords": [
     "tdk",

package/engine/assets/docker/wake-gateway/server.ts

@@ -19,12 +19,12 @@
  *                          the resource name; Compose derives it as
  *                          <project>-<service>-<replica>, confirmed empirically
  *                          against a live TDK container, e.g.
- *                          "analytics-autogenerated-data-governance-api-1"
+ *                          "tdk-erp-system-analytics-autogenerated-data-governance-api-1"
  *                          for the "data-governance-api" resource).
  *   X-Wake-Deps            Comma-separated "resourceName=containerName" pairs
  *                          for required dependencies (task 1.5: Tilt never
  *                          cascades a trigger to these on its own).
- *   X-Wake-Compose-Project The resource's Compose project (e.g. "analytics-autogenerated").
+ *   X-Wake-Compose-Project The resource's Compose project (e.g. "tdk-erp-system-analytics-autogenerated").
  *   X-Wake-Compose-Files   Comma-separated absolute compose file paths, the
  *                          same ones Tilt's `<resource>-run-only` resource
  *                          passes. The project root is mounted into this
@@ -32,7 +32,7 @@
  *                          paths inside those files resolve exactly as for Tilt.
  *   X-Wake-Env-File        Absolute path of the project's .env (optional).
  *   X-Wake-Image           The image the compose service declares
- *                          (<service>_<resource>:dev).
+ *                          (<project>_<stack>_<resource>:dev).
  *   X-Wake-Timeout-Ms, X-Wake-Proxy-Port, X-Wake-Session-Duration
  *   X-Wake-Respond-Within-Ms  How long to hold the request before answering
  *                          503 + Retry-After while the start continues in the

package/engine/topologies/platform/docker/compose/compose.star

@@ -18,7 +18,7 @@ OUTPUT = struct(AUTOGENERATED_FOLDER = ".autogenerated")
 # === END INLINED CONSTANTS ===
 
 
-load("./compose_helpers.star", "with_runtime_image_tag", "compose_build_config")
+load("./compose_helpers.star", "compose_build_config")
 load("../networking/traefik.star", "get_frontend_traefik_labels", "get_backend_traefik_labels")
 load("../networking/api_path_constants.star", "get_api_path_for_domain", "get_frontend_base_path")
 load("../secrets/infisical.star", "get_infisical_environment_vars")
@@ -78,7 +78,7 @@ def _compute_env_file_rel_path(resource_path, full_resource_path, env_filename):
 def generate_frontend_compose(resource_path, resource_name, res, manifest=None):
     """Generate frontend docker-compose entry with Traefik routing."""
     res_name = res['name']
-    image_name = with_runtime_image_tag(resource_name + '_' + res_name)
+    image_name = PlatformDockerConstants.app_image_name(resource_name, res_name)
     stack = manifest.get('stack', resource_name) if manifest else resource_name
     
     target_path = res.get('target_path', manifest.get('target_path', '/usr/share/nginx/html'))
@@ -338,7 +338,7 @@ def _generate_single_backend_entry(resource_path, resource_name, res, manifest,
         image_name=(
             manifest.get('image')
             if manifest and manifest.get('appType') == 'bring-your-own' and manifest.get('image')
-            else with_runtime_image_tag(resource_name + '_' + res_name)
+            else PlatformDockerConstants.app_image_name(resource_name, res_name)
         ),
         build_config=build_config,
         ports_section=ports_section,
@@ -541,7 +541,7 @@ def generate_migrator_compose(resource_path, resource_name, dockerfile_path=None
         str: Generated docker-compose YAML content
     """
     migrator_name = resource_name + '-db-migrator'
-    image_name = with_runtime_image_tag(resource_name + '-db-migrator')
+    image_name = PlatformDockerConstants.migrator_image_name(resource_name)
     
     # Use PROJECT_NAME from PlatformDockerConstants for portable database naming
     db_name = PlatformDockerConstants.PROJECT_NAME + '_' + resource_name

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

@@ -91,6 +91,27 @@ VERDACCIO_CONNECT_NETWORK_RESOURCE = "verdaccio-connect-network"
 VERDACCIO_DOMAIN = "verdaccio"
 VERDACCIO_TRAEFIK_HOST = "verdaccio.localhost"
 
+# Docker names for one stack's generated services. Every name carries the TDK
+# project, so two projects that both have a stack called `people` (two Tilt
+# instances on one Docker daemon) never share a Compose project, container or
+# image. Without it, the second `tdk up` runs `--remove-orphans` against the
+# first project's containers and overwrites its images.
+def compose_project_name(stack):
+    """Compose project for a stack: <project>-<stack>-autogenerated (e.g. tdk-erp-system-analytics-autogenerated)."""
+    return PROJECT_NAME_HYPHEN + "-" + stack + "-autogenerated"
+
+def app_image_name(stack, res_name):
+    """Image tag (:dev) of one service: <project>_<stack>_<resource>:dev."""
+    return PROJECT_NAME + "_" + stack + "_" + res_name + ":dev"
+
+def infra_compose_project_name(infra):
+    """Compose project for a shared platform stack: <project>-<infra> (e.g. tdk-erp-system-database-management)."""
+    return PROJECT_NAME_HYPHEN + "-" + infra
+
+def migrator_image_name(stack):
+    """Image tag (:dev) of a stack's migrator: <project>_<stack>-db-migrator:dev."""
+    return PROJECT_NAME + "_" + stack + "-db-migrator:dev"
+
 # Helper function to generate database name
 def get_db_name(domain_or_service):
     """Returns standardized database name for a domain or service."""
@@ -176,6 +197,10 @@ PlatformDockerConstants = struct(
     VERDACCIO_TRAEFIK_HOST = VERDACCIO_TRAEFIK_HOST,
     DB_CONFIG = DB_CONFIG,
     get_db_name = get_db_name,
+    compose_project_name = compose_project_name,
+    infra_compose_project_name = infra_compose_project_name,
+    app_image_name = app_image_name,
+    migrator_image_name = migrator_image_name,
     get_database_url_base = get_database_url_base,
     get_database_url_for_env = get_database_url_for_env,
     get_database_url_for_shell = get_database_url_for_shell,

package/engine/topologies/platform/docker/networking/traefik_static_routes.star

@@ -59,7 +59,9 @@ def _container_name(compose_project_name, res_name):
     """Docker Compose's own naming convention: <project>-<service>-<replica>.
 
     Confirmed empirically against a live TDK container (analytics-autogenerated
-    -data-governance-api-1) -- see design.md D2 Context. Always replica 1: a
+    -data-governance-api-1) -- see design.md D2 Context. Compose projects are now
+    <project>-<stack>-autogenerated, so the name starts with the TDK project too
+    (tdk-erp-system-analytics-autogenerated-data-governance-api-1). Always replica 1: a
     deferred resource's replica count is unrelated to which single instance
     the wake gateway needs to address."""
     return compose_project_name + "-" + res_name + "-1"

package/engine/topologies/tilt/generators/vite/templates.star

@@ -22,6 +22,10 @@ def _load_npm_scope():
 
 _NPM_SCOPE = _load_npm_scope()
 
+def _with_npm_scope(template):
+    # Fill in the scope here so callers' .format() calls need no extra argument; '{npm_scope}' is not a .format() field afterwards.
+    return template.replace('{npm_scope}', _NPM_SCOPE)
+
 TEMPLATE_VITE_BACKEND_WITH_NODE = """{header}
 import path from 'node:path';
 import {{ VitePluginNode }} from 'vite-plugin-node';
@@ -135,7 +139,7 @@ export default defineConfig({{
 }});
 """
 
-TEMPLATE_VITE_LIBRARY = """{header}
+TEMPLATE_VITE_LIBRARY = _with_npm_scope("""{header}
 import {{ resolve }} from 'node:path';
 {plugin_imports}
 import {{ defineConfig }} from 'vitest/config';
@@ -164,7 +168,7 @@ export default defineConfig({{
     rollupOptions: {{
       external: [
         /^node:.*/,
-        /^@" + _NPM_SCOPE + "\\/.*$/,
+        /^@{npm_scope}\\/.*$/,
         'react',
         'react-dom',
         'react/jsx-runtime',
@@ -223,7 +227,7 @@ export default defineConfig({{
     include: ['src/**/*.{{test,spec}}.{{ts,tsx}}'],
   }},
 }});
-"""
+""")
 
 TEMPLATE_VITE_SDK = """{header}
 import {{ federation }} from '@module-federation/vite';
@@ -261,7 +265,7 @@ export default defineConfig({{
 # Environment-Specific Library Templates
 # =============================================================================
 
-TEMPLATE_VITE_LIBRARY_DEV = """{header}
+TEMPLATE_VITE_LIBRARY_DEV = _with_npm_scope("""{header}
 import {{ resolve }} from 'node:path';
 {plugin_imports}
 import {{ defineConfig }} from 'vitest/config';
@@ -284,7 +288,7 @@ export default defineConfig({{
     rollupOptions: {{
       external: [
         /^node:.*/,
-        /^@" + _NPM_SCOPE + "\\/.*$/,
+        /^@{npm_scope}\\/.*$/,
         'react',
         'react-dom',
         'react/jsx-runtime',
@@ -341,9 +345,9 @@ export default defineConfig({{
     include: ['src/**/*.{{test,spec}}.{{ts,tsx}}'],
   }},
 }});
-"""
+""")
 
-TEMPLATE_VITE_LIBRARY_PROD = """{header}
+TEMPLATE_VITE_LIBRARY_PROD = _with_npm_scope("""{header}
 import {{ resolve }} from 'node:path';
 {plugin_imports}
 import {{ defineConfig }} from 'vitest/config';
@@ -372,7 +376,7 @@ export default defineConfig({{
     rollupOptions: {{
       external: [
         /^node:.*/,
-        /^@" + _NPM_SCOPE + "\\/.*$/,
+        /^@{npm_scope}\\/.*$/,
         'react',
         'react-dom',
         'react/jsx-runtime',
@@ -430,7 +434,7 @@ export default defineConfig({{
     include: ['src/**/*.{{test,spec}}.{{ts,tsx}}'],
   }},
 }});
-"""
+""")
 
 # =============================================================================
 # Template Generation Functions

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

@@ -43,14 +43,20 @@ def _compose_has_service(compose_path, service_name):
     return service_name in services
 
 
-def _docker_compose(compose_paths, env_file):
-    """docker_compose() wrapper: Tilt's builtin rejects env_file=None outright
-    (it type-checks the kwarg as path|string, not Optional), so the keyword must be
-    omitted entirely rather than passed as None when no .env file exists."""
+def _docker_compose(compose_paths, env_file, infra):
+    """docker_compose() wrapper for a shared platform stack, in its own Compose project.
+
+    Without project_name, Compose names the project after the file's directory, so every
+    TDK project on one Docker daemon shares `database-management`, `traefik` and so on.
+    Then one project's `up` can recreate or remove another project's services.
+    Tilt's builtin rejects env_file=None outright (it type-checks the kwarg as path|string,
+    not Optional), so the keyword must be omitted entirely rather than passed as None.
+    """
+    project_name = PlatformDockerConstants.infra_compose_project_name(infra)
     if env_file:
-        docker_compose(compose_paths, env_file=env_file)
+        docker_compose(compose_paths, project_name=project_name, env_file=env_file)
     else:
-        docker_compose(compose_paths)
+        docker_compose(compose_paths, project_name=project_name)
 
 
 def _generate_database_management_compose():
@@ -134,7 +140,7 @@ def _register_platform_postgres(should_enable, root_prefix="", env_file=None, wr
     postgres_compose = _ensure_database_management_compose(root_prefix, write_fn)
     if _file_exists(postgres_compose):
         debug_log("INFRA: Loading postgres compose from {}".format(postgres_compose))
-        _docker_compose(postgres_compose, env_file)
+        _docker_compose(postgres_compose, env_file, 'database-management')
         dc_resource('postgres', labels=['infra.tools'], resource_deps=['init-networks'], auto_init=True)
         return
     message = "Shared platform Postgres compose was not materialized at {}".format(postgres_compose)
@@ -176,7 +182,7 @@ def _load_database_management(should_enable, root_prefix="", env_file=None, writ
     messaging_compose = root_prefix + 'services/platform/messaging/docker-compose.yml'
     if _file_exists(messaging_compose):
         debug_log("INFRA: Loading messaging compose from {}".format(messaging_compose))
-        _docker_compose(messaging_compose, env_file)
+        _docker_compose(messaging_compose, env_file, 'messaging')
         # Register only services present in the project compose file. Minimal
         # NATS-only examples should not need to add an unrelated Redis broker.
         if _compose_has_service(messaging_compose, 'redis'):
@@ -218,7 +224,7 @@ def _load_infisical(should_enable, root_prefix="", env_file=None):
         return
 
     print("🔐 Loading Infisical...")
-    _docker_compose(compose_file, env_file)
+    _docker_compose(compose_file, env_file, 'infisical')
     dc_resource('infisical-db', labels=['infra.tools', 'secrets'], resource_deps=['init-networks'], auto_init=True)
     dc_resource('infisical-redis', labels=['infra.tools', 'secrets'], resource_deps=['init-networks'], auto_init=True)
     dc_resource('infisical', labels=['infra.tools', 'secrets'], resource_deps=['init-networks', 'infisical-db', 'infisical-redis'], auto_init=True)
@@ -245,7 +251,7 @@ def _load_standalone_traefik(root_prefix, env_file, write_fn):
         write_fn(compose_rel, content)
     compose_file = root_prefix + compose_rel if root_prefix else compose_rel
     print("🌐 Loading standalone Traefik from {}".format(compose_file))
-    _docker_compose(compose_file, env_file)
+    _docker_compose(compose_file, env_file, 'traefik')
     dc_resource(
         "traefik",
         labels=["infra.tools"],
@@ -281,7 +287,7 @@ def _load_proxy(should_enable, root_prefix="", env_file=None, write_fn=None):
 
     # Use introvertic/infra traefik configuration (primary)
     # Keep legacy core.yml for network definitions during migration
-    _docker_compose(compose_files, env_file)
+    _docker_compose(compose_files, env_file, 'proxy')
     
     # Traefik depends on core infrastructure being healthy (not just started) to prevent 504s
     dc_resource('traefik', 
@@ -316,7 +322,7 @@ def _load_monitoring(should_enable, root_prefix="", env_file=None):
         return
     
     print("📊 Loading monitoring services...")
-    _docker_compose(root_prefix + 'services/platform/monitoring/docker-compose.yml', env_file)
+    _docker_compose(root_prefix + 'services/platform/monitoring/docker-compose.yml', env_file, 'monitoring')
     for svc in ['signoz-frontend', 'signoz-otel-collector', 'signoz-query-service']:
         dc_resource(svc, labels=['observability.apm'], auto_init=True)
     dc_resource('clickhouse', labels=['observability.storage'], auto_init=True)
@@ -335,7 +341,7 @@ def _load_debezium(should_enable, root_prefix="", env_file=None):
         return
     
     print("🔄 Loading Enhanced Debezium...")
-    _docker_compose(root_prefix + 'services/platform/cdc/docker-compose.enhanced.yml', env_file)
+    _docker_compose(root_prefix + 'services/platform/cdc/docker-compose.enhanced.yml', env_file, 'cdc')
     dc_resource('nats-http-bridge', labels=['cdc'], resource_deps=['nats'], auto_init=True)
     dc_resource('debezium-connect', labels=['cdc'], resource_deps=['kafka', 'postgres', 'nats-http-bridge'], auto_init=True)
     dc_resource('enhanced-connector-setup', labels=['cdc'], resource_deps=['debezium-connect', 'postgres', 'nats-http-bridge'], auto_init=False)
@@ -351,7 +357,7 @@ def _load_elk(should_enable, root_prefix="", env_file=None):
         return
 
     print("📊 Loading ELK stack...")
-    _docker_compose(root_prefix + 'docker/elk-compose.yml', env_file)
+    _docker_compose(root_prefix + 'docker/elk-compose.yml', env_file, 'elk')
     dc_resource('elasticsearch', labels=['observability.elk'], auto_init=True)
     dc_resource('logstash', labels=['observability.elk', 'processor', 'logs'], resource_deps=['elasticsearch'], auto_init=True)
     dc_resource('kibana', labels=['observability.elk', 'frontend', 'dashboard'], resource_deps=['elasticsearch'], auto_init=True)

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

@@ -284,7 +284,7 @@ def resolve_defer_start_dependencies(manifest, resource_manifests, all_services_
         dep_service_name = all_services_map.get(resolved_dep, {}).get('name', '')
         if not dep_service_name:
             continue
-        dependencies.append((resolved_dep, dep_service_name + '-autogenerated'))
+        dependencies.append((resolved_dep, PlatformDockerConstants.compose_project_name(dep_service_name)))
     return dependencies
 
 
@@ -366,8 +366,8 @@ def _build_live_update_rules(res_path, full_res_path, syncs, project_root='', la
 
 
 def _app_image_name(resource_name, res_name):
-    """The image ref docker_build builds and the app compose service declares."""
-    return resource_name + '_' + res_name + ':dev'
+    """The image ref docker_build builds and the app compose service declares (project-scoped; see constants.star)."""
+    return PlatformDockerConstants.app_image_name(resource_name, res_name)
 
 
 def _wake_compose_invocation(project_root, resource_path, res_name, resource_name):
@@ -670,7 +670,7 @@ def register_compose_resources(resource_config, ctx, runtime_flags, manifest_sta
     debug_log("COMPOSE: Proceeding with '{}' - creating compose resources".format(resource_name))
     should_enable = ctx['should_enable']
     write_file = ctx['write_file']
-    compose_project_name = resource_name + '-autogenerated'
+    compose_project_name = PlatformDockerConstants.compose_project_name(resource_name)
     
     resource_manifests = manifest_state['resource_manifests']
     config_gen_resources = manifest_state['config_gen_resources']

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

@@ -77,7 +77,7 @@ def _build_dependency_env_lines(manifest):
         lines += 'VITE_{dep_key}_API_URL=http://{local_domain}{dep_api_path}\n'.format(
             dep_key=dep_key,
             dep_api_path=dep_api_path,
-            local_domain=PlatformDockerConstants.LOCAL_DOMAIN,
+            local_domain=PlatformDockerConstants.API_LOCAL_DOMAIN,
         )
     return lines
 
@@ -136,7 +136,8 @@ def _generate_params_env(manifest, backend_manifest=None, write_fn=None):
     port = manifest.get('port', BASE_PORT_FRONTEND)
     # Use standardized API path from traefik helpers
     api_path = get_api_path(stack)
-    api_url = 'http://' + PlatformDockerConstants.LOCAL_DOMAIN + api_path
+    # Traefik routes /api/<stack>-management only on api.<project>.localhost (see traefik.star), so the URL uses that host.
+    api_url = 'http://' + PlatformDockerConstants.API_LOCAL_DOMAIN + api_path
     target_filename = '/' + OUTPUT.AUTOGENERATED_FOLDER + '/.env.backend.autogenerated'
     
     # Auth configuration: the same builder Compose uses, so the two outputs cannot disagree. A missing value is None and AuthConfig

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

@@ -49,7 +49,7 @@ def generate_frontend_api_client(manifest, write_fn=None):
 // Source: engine/topologies/tilt/resources/orchestrator/generators/frontend.star
 // Purpose: Pre-configured API client for {stack} resource
 
-import {{ createApiClient }} from '@" + _NPM_SCOPE + "'/platform-api-client';
+import {{ createApiClient }} from '@{npm_scope}/platform-api-client';
 
 /**
  * Pre-configured API client for {stack} resource
@@ -68,6 +68,7 @@ export const apiClient = createApiClient({{
 export default apiClient;
 '''.format(
         stack=stack,
+        npm_scope=_NPM_SCOPE,
         api_path=api_path,
         local_domain=PlatformDockerConstants.API_LOCAL_DOMAIN,
     )

package/package.json

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