@tdk-landscape/tdk-cli-core 1.3.156 → 1.3.157

package/cli/dist/commands/doctor.js

@@ -12,13 +12,12 @@ import { projectNeedsBun } from "../utils/bun-requirement.js";
 import { AUTOGENERATED_DIR, CONTAINER_RUNTIME_CHECK, MASTER_CONFIG_FILES, PACKAGE_JSON, REQUIRED_PACKAGE_SCRIPTS, } from "../utils/constants.js";
 import { isPathDiscovered, readDiscoveryPaths } from "../utils/discovery-paths.js";
 import { checkCrashLoopingContainers } from "../utils/doctor-crashloop.js";
-import { applyDoctorFixes, checkDuplicateTdkInstalls, hasFailedActions, planDoctorFixes, } from "../utils/doctor-fix.js";
+import { applyDoctorFixes, checkDuplicateTdkInstalls, hasFailedActions, planDoctorFixes, projectTiltPids, } from "../utils/doctor-fix.js";
 import { checkDiskSpace, dockerDesktopStuck } from "../utils/doctor-host.js";
 import { collectDoctorChecks, createDoctorReport, getDoctorExitCode, } from "../utils/doctor-report.js";
 import { checkHealthRoutes, checkIngressPorts, checkPrivateNpmRegistry, checkTiltResourceHealth, projectConfigEnablesVerdaccio, summarizeAdvertisedProbes, summarizeServiceProbes, summarizeSmokeResults, } from "../utils/doctor-runtime.js";
 import { checkStarlarkLoadExports } from "../utils/doctor-starlark.js";
 import { checkDockerNetworkCapacity, checkDuplicateResourceNames, checkDuplicateResourcePorts, checkFrontendBackendUrls, checkMigrationsInApi, checkNatsBroker, checkPrismaConsistency, checkResourcePackageJson, checkServiceUrlPorts, checkSharedPlatformPostgres, checkSharedStackRoutes, checkTiltInstances, } from "../utils/doctor-wiring.js";
-import { findProjectTiltUpPids } from "../utils/down-cleanup.js";
 import { validateEnvFile } from "../utils/env-validator.js";
 import { execAsync, isExecTimeout } from "../utils/exec-async.js";
 import { formatCount } from "../utils/formatting.js";
@@ -1100,9 +1099,7 @@ export const doctorCommand = new Command("doctor")
                     // An unreadable config is reported by the project checks below.
                 }
             }
-            const tiltPids = projectRoot
-                ? findProjectTiltUpPids(join(projectRoot, ".tdk", ".tdk-out", "Tiltfile"))
-                : [];
+            const tiltPids = projectRoot ? projectTiltPids(projectRoot) : [];
             const planned = await planDoctorFixes(projectName, undefined, tiltPids.length > 0
                 ? `Tilt is running for this project (pid ${tiltPids.join(", ")}); run tdk down first`
                 : undefined);

package/cli/dist/utils/doctor-crashloop.js

@@ -55,7 +55,8 @@ export function crashLoopHint(logs, state) {
     if (/ECONNREFUSED|connection refused|could not connect/i.test(logs)) {
         return "a dependency is not reachable: check that the service it connects to is running and healthy";
     }
-    if (/(is not set|is required|missing required|undefined).*(env|environment|variable)|environment variable.*(missing|not set|required)/i.test(logs)) {
+    if (/\b(?:environment variable|env var)\b.*\b(?:missing|not set|required|undefined)\b/i.test(logs) ||
+        /\b[A-Z][A-Z0-9_]{2,}\b (?:is )?(?:not set|required|missing)\b/.test(logs)) {
         return "a required environment variable is missing: check the project's .env";
     }
     if (state.exitCode === 137)

package/cli/dist/utils/doctor-fix.js

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: MIT
 import { execFile } from "node:child_process";
 import { realpathSync } from "node:fs";
+import { join } from "node:path";
 import { promisify } from "node:util";
-import { projectNetworkNames } from "./down-cleanup.js";
+import { findProjectTiltUpPids, projectNetworkNames } from "./down-cleanup.js";
 import { findAllOnPath } from "./which.js";
 const execFilePromise = promisify(execFile);
 const DOCKER_TIMEOUT_MS = 15_000;
@@ -209,3 +210,22 @@ export async function checkDuplicateTdkInstalls(installs) {
         fix: "Keep one: remove the others, or run tdk upgrade. The first on PATH is the one your shell runs; tools that launch /usr/local/bin/tdk directly may use another",
     };
 }
+/**
+ * PIDs of `tilt up` processes for this project. The process list shows the Tiltfile path as it was typed at launch,
+ * which may or may not be the symlink-resolved path, so both spellings are looked up.
+ */
+export function projectTiltPids(projectRoot, find = findProjectTiltUpPids) {
+    const roots = new Set([projectRoot]);
+    try {
+        roots.add(realpathSync(projectRoot));
+    }
+    catch {
+        // Keep the path as given.
+    }
+    const pids = new Set();
+    for (const root of roots) {
+        for (const pid of find(join(root, ".tdk", ".tdk-out", "Tiltfile")))
+            pids.add(pid);
+    }
+    return [...pids];
+}