@tdk-landscape/tdk-cli-core 1.3.49 → 1.3.50

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tdk-cli-internal",
-  "version": "1.3.49",
+  "version": "1.3.50",
   "description": "TDK CLI - Tilt Development Kit command line interface",
   "keywords": [
     "tdk",
@@ -53,25 +53,24 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "commander": "^12.0.0",
+    "commander": "^15.0.0",
     "handlebars": "^4.7.8",
-    "ink": "^7.0.1",
+    "ink": "^7.1.1",
     "ink-select-input": "^6.2.0",
-    "ora": "^8.0.0",
-    "react": "^19.2.5"
+    "ora": "^9.4.1",
+    "react": "^19.3.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.13",
-    "@types/react": "^19.2.14",
-    "@types/inquirer": "^9.0.0",
-    "@types/node": "^20.0.0",
-    "knip": "^6.35.1",
-    "react-devtools-core": "^6.1.1",
+    "@types/react": "^19.3.0",
+    "@types/node": "^22.0.0",
+    "knip": "^6.38.0",
+    "react-devtools-core": "^8.0.0",
     "typescript": "^7.0.2",
-    "vite": "^6.0.0",
+    "vite": "^8.3.1",
     "vitest": "^5.0.0"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.12.0"
   }
 }

package/cli/src/commands/__tests__/always-enabled-infra.test.ts

@@ -45,10 +45,7 @@ describe("always_enabled_infra", () => {
           enabledStacks: [],
         },
       },
-      always_enabled_infra: [
-        "database-management",
-        "proxy",
-      ],
+      always_enabled_infra: ["database-management", "proxy"],
     };
 
     expect(projectConfig.always_enabled_infra).toContain("database-management");
@@ -85,10 +82,7 @@ describe("always_enabled_infra", () => {
     };
 
     // TemplateEngine uses ?? operator to default when undefined/null
-    const defaults = projectConfig.always_enabled_infra ?? [
-      "database-management",
-      "proxy",
-    ];
+    const defaults = projectConfig.always_enabled_infra ?? ["database-management", "proxy"];
 
     expect(defaults).toContain("database-management");
     expect(defaults).toContain("proxy");

package/cli/src/commands/__tests__/doctor.test.ts

@@ -2,11 +2,6 @@ import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import {
-  checkFrontendDockerPreflight,
-  checkGeneratedProjectRuntimeAssets,
-  checkStarlarkLoadExports,
-} from "../doctor.js";
 import {
   checkIngressPorts,
   checkPrivateNpmRegistry,
@@ -18,6 +13,13 @@ import {
   probeContainerRuntimeError,
   summarizeTiltBuildError,
 } from "../../utils/doctor-runtime.js";
+import {
+  checkDockerVersions,
+  checkFrontendDockerPreflight,
+  checkGeneratedProjectRuntimeAssets,
+  checkStarlarkLoadExports,
+  checkTypeScriptTypeDependencies,
+} from "../doctor.js";
 
 describe("doctor frontend Docker preflight", () => {
   let testDir: string;
@@ -240,6 +242,9 @@ describe("doctor generated runtime asset preflight", () => {
       "bun-hoisted-symlink-fix.sh",
       "prisma-bun-client-link-fix.sh",
       "prisma-normalize-client.sh",
+      "prisma-runtime-relink.sh",
+      "infisical-entrypoint.sh",
+      "migrate.sh",
     ]) {
       writeFileSync(join(templateDir, file), "#!/bin/sh\n");
     }
@@ -268,6 +273,75 @@ describe("doctor generated runtime asset preflight", () => {
   });
 });
 
+describe("doctor TypeScript type dependency check", () => {
+  let testDir: string;
+  let originalCwd: string;
+
+  beforeEach(() => {
+    originalCwd = process.cwd();
+    testDir = join(
+      tmpdir(),
+      `tdk-doctor-types-bun-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+    );
+    mkdirSync(testDir, { recursive: true });
+    process.chdir(testDir);
+  });
+
+  afterEach(() => {
+    process.chdir(originalCwd);
+    if (testDir && existsSync(testDir)) {
+      rmSync(testDir, { recursive: true, force: true });
+    }
+  });
+
+  function writeBackendResource(devDependencies: Record<string, string>) {
+    const appDir = join(testDir, "services", "finance", "cash-management-api");
+    const generatedDir = join(appDir, ".autogenerated");
+    mkdirSync(generatedDir, { recursive: true });
+
+    writeFileSync(
+      join(appDir, "service.json"),
+      JSON.stringify(
+        {
+          appName: "cash-management-api",
+          appType: "backend",
+          stack: "finance",
+          port: 4000,
+        },
+        null,
+        2,
+      ),
+    );
+    writeFileSync(
+      join(appDir, "package.json"),
+      JSON.stringify({ name: "cash-management-api", devDependencies }, null, 2),
+    );
+    writeFileSync(
+      join(generatedDir, "tsconfig.docker.autogenerated.json"),
+      JSON.stringify({ compilerOptions: { types: ["bun"] } }, null, 2),
+    );
+  }
+
+  it('fails when a service\'s tsconfig sets "types": ["bun"] but @types/bun is not a devDependency', () => {
+    writeBackendResource({ typescript: "^5.0.0" });
+
+    const result = checkTypeScriptTypeDependencies();
+
+    expect(result.didPass).toBe(false);
+    expect(result.message).toContain("cash-management-api");
+    expect(result.message).toContain("@types/bun");
+    expect(result.fix).toContain('"@types/bun"');
+  });
+
+  it('passes when @types/bun is a devDependency alongside "types": ["bun"]', () => {
+    writeBackendResource({ typescript: "^5.0.0", "@types/bun": "^1.4.2" });
+
+    const result = checkTypeScriptTypeDependencies();
+
+    expect(result.didPass).toBe(true);
+  });
+});
+
 describe("doctor ingress + tilt runtime checks", () => {
   it("detects a foreign Traefik holding host port 80", () => {
     const dockerPs = [
@@ -290,8 +364,7 @@ describe("doctor ingress + tilt runtime checks", () => {
   });
 
   it("passes when this project's Traefik owns the ingress ports", () => {
-    const dockerPs =
-      "beauty_crm_traefik\t0.0.0.0:80->80/tcp,:::80->80/tcp,0.0.0.0:443->443/tcp";
+    const dockerPs = "beauty_crm_traefik\t0.0.0.0:80->80/tcp,:::80->80/tcp,0.0.0.0:443->443/tcp";
     const result = checkIngressPorts((() => dockerPs) as never, "beauty-crm");
     expect(result.didPass).toBe(true);
     expect(result.message).toContain("beauty_crm_traefik");
@@ -308,7 +381,7 @@ describe("doctor ingress + tilt runtime checks", () => {
             buildHistory: [
               {
                 error:
-                  'Bind for 0.0.0.0:80 failed: port is already allocated\nerror: exit status 1',
+                  "Bind for 0.0.0.0:80 failed: port is already allocated\nerror: exit status 1",
               },
             ],
           },
@@ -337,6 +410,66 @@ describe("doctor ingress + tilt runtime checks", () => {
     expect(result.fix).toMatch(/docker ps --filter publish=80|Free the conflicting/);
   });
 
+  it("separates sablier.deferStart resources from genuinely pending ones", () => {
+    const payload = {
+      items: [
+        {
+          metadata: { name: "data-governance-api" },
+          status: { updateStatus: "none", runtimeStatus: "none" },
+        },
+        {
+          metadata: { name: "some-other-stuck-resource" },
+          status: { updateStatus: "pending", runtimeStatus: "pending" },
+        },
+        {
+          metadata: { name: "postgres" },
+          status: { updateStatus: "ok", runtimeStatus: "ok" },
+        },
+      ],
+    };
+
+    const parsed = parseTiltResourceFailures(
+      JSON.stringify(payload),
+      new Set(["data-governance-api"]),
+    );
+    expect(parsed.failures).toHaveLength(0);
+    expect(parsed.deferredCount).toBe(1);
+    expect(parsed.pendingCount).toBe(1);
+
+    const result = checkTiltResourceHealth((() => JSON.stringify(payload)) as never);
+    expect(result.didPass).toBe(true);
+    // Without an injected deferredNames set (checkTiltResourceHealth computes
+    // its own via discoverResources(), best-effort empty outside a project),
+    // this specific resource isn't classified as deferred here -- covered by
+    // the direct parseTiltResourceFailures assertions above instead.
+  });
+
+  it("does not describe deferred resources as blocked by unrelated failures", () => {
+    const payload = {
+      items: [
+        {
+          metadata: { name: "traefik" },
+          status: {
+            updateStatus: "error",
+            runtimeStatus: "unknown",
+            buildHistory: [{ error: "Bind for 0.0.0.0:80 failed: port is already allocated" }],
+          },
+        },
+        {
+          metadata: { name: "data-governance-api" },
+          status: { updateStatus: "none", runtimeStatus: "none" },
+        },
+      ],
+    };
+
+    const parsed = parseTiltResourceFailures(
+      JSON.stringify(payload),
+      new Set(["data-governance-api"]),
+    );
+    expect(parsed.deferredCount).toBe(1);
+    expect(parsed.pendingCount).toBe(0);
+  });
+
   it("skips tilt resource check when tilt is not running", () => {
     const result = checkTiltResourceHealth((() => {
       throw new Error("tilt not running");
@@ -555,3 +688,43 @@ describe("doctor ingress + tilt runtime checks", () => {
     rmSync(projectRoot, { recursive: true, force: true });
   });
 });
+
+describe("doctor Docker version check", () => {
+  function fakeExec(engine: string, compose: string) {
+    return ((command: string) =>
+      command.startsWith("docker compose") ? `${compose}\n` : `${engine}\n`) as never;
+  }
+
+  it("passes on Docker Engine 25+ and Compose 2.20.2+", () => {
+    const result = checkDockerVersions(fakeExec("29.8.0", "2.39.1"));
+
+    expect(result.didPass).toBe(true);
+    expect(result.isSkipped).toBeFalsy();
+    expect(result.message).toContain("29.8.0");
+  });
+
+  it("fails with an upgrade hint when the engine is older than 25", () => {
+    const result = checkDockerVersions(fakeExec("24.0.7", "2.39.1"));
+
+    expect(result.didPass).toBe(false);
+    expect(result.message).toContain("Docker Engine 24.0.7");
+    expect(result.message).toContain("start_interval");
+    expect(result.fix).toContain("Update Docker");
+  });
+
+  it("fails when Compose is older than 2.20.2", () => {
+    const result = checkDockerVersions(fakeExec("27.1.1", "v2.20.1"));
+
+    expect(result.didPass).toBe(false);
+    expect(result.message).toContain("Docker Compose v2.20.1");
+  });
+
+  it("skips instead of failing when versions cannot be read", () => {
+    const result = checkDockerVersions((() => {
+      throw new Error("docker not found");
+    }) as never);
+
+    expect(result.didPass).toBe(true);
+    expect(result.isSkipped).toBe(true);
+  });
+});

package/cli/src/commands/__tests__/phases-model.test.ts

@@ -75,9 +75,7 @@ describe("Project → Phase → Stack → Resource model", () => {
   });
 
   it("deduplicates enabledStacks per phase", () => {
-    const enabledStacks = Array.from(
-      new Set(["proxy", "billing", "checkout-app", "billing"]),
-    );
+    const enabledStacks = Array.from(new Set(["proxy", "billing", "checkout-app", "billing"]));
 
     expect(enabledStacks).toEqual(["proxy", "billing", "checkout-app"]);
     expect(enabledStacks.filter((s) => s === "billing")).toHaveLength(1);
@@ -142,7 +140,7 @@ describe("Project → Phase → Stack → Resource model", () => {
     const resourceEntries = enabledStacks.map((stack) => `"${stack}": True`);
     const specMaster = `PRE_ALPHA_RESOURCES = {\n${resourceEntries.join(",\n")}\n}`;
 
-    expect(specMaster).toContain('PRE_ALPHA_RESOURCES = {');
+    expect(specMaster).toContain("PRE_ALPHA_RESOURCES = {");
     expect(specMaster).toContain('"billing": True');
     expect(specMaster).toContain('"checkout-app": True');
     expect(specMaster).not.toContain('"services"');

package/cli/src/commands/__tests__/project-resource-features-e2e.test.ts

@@ -34,7 +34,7 @@ describe("project and resource feature E2E", () => {
   let projectRoot = "";
 
   afterEach(() => {
-    if (projectRoot && projectRoot.startsWith(tmpdir())) {
+    if (projectRoot?.startsWith(tmpdir())) {
       rmSync(projectRoot, { recursive: true, force: true });
     }
   });
@@ -113,9 +113,7 @@ describe("project and resource feature E2E", () => {
       "prisma-normalize-client.sh",
     ]) {
       expect(
-        existsSync(
-          join(projectRoot, "shared-platform-engineering", "docker-templates", file),
-        ),
+        existsSync(join(projectRoot, "shared-platform-engineering", "docker-templates", file)),
       ).toBe(true);
     }
   }, 10000);
@@ -166,30 +164,12 @@ describe("project and resource feature E2E", () => {
     runTdk(["project", "--yes"], projectRoot);
 
     runTdk(
-      [
-        "resource",
-        "api",
-        "--type",
-        "backend",
-        "--stack",
-        "alpha",
-        "--path",
-        "services/alpha/api",
-      ],
+      ["resource", "api", "--type", "backend", "--stack", "alpha", "--path", "services/alpha/api"],
       projectRoot,
       "\n",
     );
     runTdk(
-      [
-        "resource",
-        "web",
-        "--type",
-        "frontend",
-        "--stack",
-        "alpha",
-        "--path",
-        "services/alpha/web",
-      ],
+      ["resource", "web", "--type", "frontend", "--stack", "alpha", "--path", "services/alpha/web"],
       projectRoot,
       "\n",
     );

package/cli/src/commands/__tests__/saas-starter-integration.test.ts

@@ -1,10 +1,9 @@
-import { describe, expect, it, beforeEach, afterEach } from "vitest";
 import { execSync } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
 import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { dirname } from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 // Get the CLI bin path dynamically
 const __filename = fileURLToPath(import.meta.url);
@@ -48,8 +47,7 @@ describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery
     try {
       // Safety: only delete if path is under tmpdir and contains our test marker
       if (
-        testDir &&
-        testDir.startsWith(tmpdir()) &&
+        testDir?.startsWith(tmpdir()) &&
         testDir.includes("tdk-saas-test-") &&
         testDir.length > 20
       ) {
@@ -117,7 +115,7 @@ describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery
     // Generate project config
     execSync(
       `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun "${CLI_BIN_PATH}" project --yes`,
-      { stdio: "pipe" }
+      { stdio: "pipe" },
     );
 
     // Verify project.json has services populated
@@ -148,7 +146,7 @@ describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery
 
     execSync(
       `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun ${CLI_BIN_PATH} project --yes`,
-      { stdio: "pipe" }
+      { stdio: "pipe" },
     );
 
     const specPath = join(starterRoot, ".tdk", ".tdk-out", "spec.master");
@@ -158,10 +156,10 @@ describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery
 
     // Before fix: PRE_ALPHA_RESOURCES = { }
     // After fix: PRE_ALPHA_RESOURCES = { "app": True, "billing": True, }
-    expect(specContent).toContain('PRE_ALPHA_RESOURCES = {');
+    expect(specContent).toContain("PRE_ALPHA_RESOURCES = {");
     expect(specContent).toMatch(/"app":\s*True/);
     expect(specContent).toMatch(/"billing":\s*True/);
-    expect(specContent).toContain('FOCUS_PRE_ALPHA = list(PRE_ALPHA_RESOURCES.keys())');
+    expect(specContent).toContain("FOCUS_PRE_ALPHA = list(PRE_ALPHA_RESOURCES.keys())");
   });
 
   /**
@@ -181,7 +179,7 @@ describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery
 
     execSync(
       `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun ${CLI_BIN_PATH} project --yes`,
-      { stdio: "pipe" }
+      { stdio: "pipe" },
     );
 
     // Doctor should pass (all master configs present)

package/cli/src/commands/__tests__/stack-features-e2e.test.ts

@@ -25,7 +25,7 @@ describe("stack feature E2E", () => {
   let projectRoot = "";
 
   afterEach(() => {
-    if (projectRoot && projectRoot.startsWith(tmpdir())) {
+    if (projectRoot?.startsWith(tmpdir())) {
       rmSync(projectRoot, { recursive: true, force: true });
     }
   });
@@ -36,7 +36,9 @@ describe("stack feature E2E", () => {
     const output = runTdk(["project", "--yes"], projectRoot);
     expect(output).toContain("Generated: services/platform/database-management/docker-compose.yml");
 
-    const projectJson = JSON.parse(readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"));
+    const projectJson = JSON.parse(
+      readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"),
+    );
     expect(projectJson.stack_features).toBeUndefined();
     expect(projectJson.phases.pre_alpha.enabledStacks).toContain("database-management");
 
@@ -51,7 +53,9 @@ describe("stack feature E2E", () => {
 
     const compose = readFileSync(composePath, "utf-8");
     expect(compose).toContain("Stack feature: database-management");
-    expect(compose).toContain('Source: .tdk/project.json phases.*.enabledStacks includes "database-management"');
+    expect(compose).toContain(
+      'Source: .tdk/project.json phases.*.enabledStacks includes "database-management"',
+    );
     expect(compose).toContain("container_name: tdk_stack_feature_");
     expect(compose).toContain("_postgres");
     expect(compose).toContain("_database");
@@ -120,7 +124,9 @@ describe("stack feature E2E", () => {
 
     runTdk(["project", "--yes"], projectRoot);
 
-    const projectJson = JSON.parse(readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"));
+    const projectJson = JSON.parse(
+      readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"),
+    );
     expect(projectJson.phases.pre_alpha.enabledStacks).toContain("billing");
 
     const spec = readFileSync(join(projectRoot, ".tdk", ".tdk-out", "spec.master"), "utf-8");

package/cli/src/commands/__tests__/upgrade.test.ts

@@ -9,6 +9,7 @@ vi.mock("node:child_process", () => ({
 }));
 
 const { upgradeViaBinary, isWritable } = await import("../upgrade.js");
+
 import type { BinaryRelease } from "../upgrade.js";
 
 // Regression coverage for: `tdk upgrade` used to only swap the `tdk` binary
@@ -56,7 +57,8 @@ describe("upgradeViaBinary", () => {
     expect(commands.some((c) => c.startsWith("mkdir -p") && c.includes(engineDir))).toBe(true);
     expect(
       commands.some(
-        (c) => c.includes("tar -xzf") && c.includes(engineDir) && c.includes("--strip-components=1"),
+        (c) =>
+          c.includes("tar -xzf") && c.includes(engineDir) && c.includes("--strip-components=1"),
       ),
     ).toBe(true);
   });
@@ -77,19 +79,27 @@ describe("upgradeViaBinary", () => {
     expect(tarIndex).toBeGreaterThan(engineCurlIndex);
   });
 
-  it("never shells out to sudo, and fails fast without touching the network when the install dir isn't writable", async () => {
-    chmodSync(installDir, 0o555);
-    try {
-      const ok = await upgradeViaBinary(tdkPath, release);
-      expect(ok).toBe(false);
-      expect(execSyncMock).not.toHaveBeenCalled();
-      expect(commandsRun().some((c) => c.includes("sudo"))).toBe(false);
-    } finally {
-      chmodSync(installDir, 0o755);
-    }
-  });
+  // root ignores the write-permission bit (accessSync(W_OK) legitimately
+  // returns true even on a 0o555 dir), so these checks only hold for
+  // non-root users.
+  const isRoot = process.getuid?.() === 0;
+
+  it.skipIf(isRoot)(
+    "never shells out to sudo, and fails fast without touching the network when the install dir isn't writable",
+    async () => {
+      chmodSync(installDir, 0o555);
+      try {
+        const ok = await upgradeViaBinary(tdkPath, release);
+        expect(ok).toBe(false);
+        expect(execSyncMock).not.toHaveBeenCalled();
+        expect(commandsRun().some((c) => c.includes("sudo"))).toBe(false);
+      } finally {
+        chmodSync(installDir, 0o755);
+      }
+    },
+  );
 
-  it("isWritable reflects actual filesystem permissions", () => {
+  it.skipIf(isRoot)("isWritable reflects actual filesystem permissions", () => {
     expect(isWritable(installDir)).toBe(true);
     chmodSync(installDir, 0o555);
     try {