@tdk-landscape/tdk-cli-core 1.3.75 → 1.3.77

package/cli/dist/utils/errors.js

@@ -63,16 +63,16 @@ export const errorFactories = {
         "Path must be within the project directory",
         'Path cannot contain special characters like <>:"|?*',
     ]),
-    notInProject: () => new TdkError("Could not find project root (no Tiltfile found)", [
-        "Run this from within a project that has a Tiltfile",
-        "Run `tdk project` to initialize a new project",
+    notInProject: () => new TdkError("Could not find project root (no .tdk/project.json found)", [
+        "Run this from within a TDK project",
+        "Run `tdk project --yes` to initialize a new project",
     ]),
 };
 export function requireProjectRoot() {
     const projectRoot = findProjectRoot();
     if (!projectRoot) {
-        console.error(chalk.red("Error: Could not find project root (no Tiltfile found)."));
-        console.error(chalk.gray("Run this from within a project that has a Tiltfile."));
+        console.error(chalk.red("Error: Could not find project root (no .tdk/project.json found)."));
+        console.error(chalk.gray("Run `tdk project --yes` to initialize a new project."));
         process.exit(1);
     }
     return projectRoot;

package/cli/dist/utils/exec-async.js

@@ -0,0 +1,30 @@
+import { exec, execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { findOnPath } from "./which.js";
+const execPromise = promisify(exec);
+export const execAsync = async (command, timeoutMs) => {
+    if (process.platform === "win32") {
+        // Doctor commands are simple executable/argument invocations. Tokenize
+        // their quoted arguments and bypass cmd.exe/PowerShell entirely.
+        const parts = command.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) ?? [];
+        const [parsedFile, ...args] = parts.map((part) => part.startsWith('"') || part.startsWith("'") ? part.slice(1, -1) : part);
+        if (!parsedFile)
+            throw new Error("Command is empty");
+        const file = findOnPath(parsedFile) ?? parsedFile;
+        const { stdout } = await promisify(execFile)(file, args, {
+            encoding: "utf-8",
+            timeout: timeoutMs,
+            windowsHide: true,
+            shell: false,
+        });
+        return stdout;
+    }
+    const { stdout } = await execPromise(command, { encoding: "utf-8", timeout: timeoutMs });
+    return stdout;
+};
+/** `exec` kills a timed-out child and sets `killed`; `execSync` reports ETIMEDOUT. */
+export function isExecTimeout(err) {
+    const e = err;
+    return e?.code === "ETIMEDOUT" || e?.killed === true;
+}
+//# sourceMappingURL=exec-async.js.map

package/cli/dist/utils/generated-paths.js

@@ -0,0 +1,49 @@
+import { existsSync, lstatSync } from "node:fs";
+import { isAbsolute, normalize, relative, sep } from "node:path";
+/** Reviewed TDK-owned destinations written by `tdk config regenerate` or Tilt generation. */
+export const TDK_GENERATED_PATH_ALLOWLIST = [
+    ".autogenerated/**",
+    ".tdk/.tdk-out/**",
+    "Tiltfile",
+    "TILT_*.star",
+    ".tiltignore",
+    "package.json (create only)",
+    "shared-platform-engineering/docker-templates/**",
+    "services/platform/database-management/docker-compose.yml",
+    "product_autogenerated_resource_manifests/**",
+    "product_autogenerated_services_list/**",
+];
+export function isTdkGeneratedPath(path) {
+    const normalized = normalize(path).split(sep).join("/");
+    if (isAbsolute(path) || normalized === ".." || normalized.startsWith("../"))
+        return false;
+    if (normalized.split("/").includes(".autogenerated") ||
+        normalized.startsWith(".tdk/.tdk-out/") ||
+        normalized === "shared-platform-engineering/docker-templates" ||
+        normalized.startsWith("shared-platform-engineering/docker-templates/") ||
+        normalized.startsWith("product_autogenerated_resource_manifests/") ||
+        normalized.startsWith("product_autogenerated_services_list/")) {
+        return true;
+    }
+    return (normalized === "Tiltfile" ||
+        /^TILT_[^/]+\.star$/.test(normalized) ||
+        normalized === ".tiltignore" ||
+        normalized === "package.json" ||
+        normalized === "services/platform/database-management/docker-compose.yml");
+}
+export function assertTdkGeneratedPath(projectRoot, path) {
+    const absolute = isAbsolute(path) ? normalize(path) : normalize(`${projectRoot}/${path}`);
+    const projectRelative = relative(projectRoot, absolute).split(sep).join("/");
+    if (!isTdkGeneratedPath(projectRelative)) {
+        throw new Error(`Refusing to write outside TDK's generated-file allowlist: ${projectRelative}`);
+    }
+    let cursor = projectRoot;
+    for (const segment of projectRelative.split("/")) {
+        cursor = normalize(`${cursor}/${segment}`);
+        if (existsSync(cursor) && lstatSync(cursor).isSymbolicLink()) {
+            throw new Error(`Refusing to write through a symbolic link in generated path: ${projectRelative}`);
+        }
+    }
+    return absolute;
+}
+//# sourceMappingURL=generated-paths.js.map

package/cli/dist/utils/platform.js

@@ -0,0 +1,53 @@
+import { delimiter, extname } from "node:path";
+export function isWindows() {
+    return process.platform === "win32";
+}
+export function tdkOsFor(platformName) {
+    if (platformName === "linux")
+        return "linux";
+    if (platformName === "darwin")
+        return "darwin";
+    if (platformName === "win32")
+        return "windows";
+    return null;
+}
+export function tdkOs() {
+    return tdkOsFor(process.platform);
+}
+export function tdkArchFor(architecture) {
+    if (architecture === "x64")
+        return "amd64";
+    if (architecture === "arm64")
+        return "arm64";
+    return null;
+}
+export function tdkArch() {
+    return tdkArchFor(process.arch);
+}
+export function binaryAssetNameFor(platformName, architecture) {
+    const osName = tdkOsFor(platformName);
+    const archName = tdkArchFor(architecture);
+    if (!osName || !archName)
+        return null;
+    if (osName === "windows" && archName !== "amd64")
+        return null;
+    const base = `tdk-${osName}-${archName}`;
+    return osName === "windows" ? `${base}.exe` : base;
+}
+export function binaryAssetName() {
+    return binaryAssetNameFor(process.platform, process.arch);
+}
+export function executableName() {
+    return isWindows() ? "tdk.exe" : "tdk";
+}
+export function pathLookups(binName, windows = isWindows()) {
+    if (!windows)
+        return [binName];
+    if (extname(binName))
+        return [binName];
+    return [binName, `${binName}.exe`, `${binName}.cmd`, `${binName}.bat`];
+}
+export function pathDelimiter(windows = isWindows()) {
+    return windows ? ";" : delimiter;
+}
+//# sourceMappingURL=platform.js.map

package/cli/dist/utils/port-assignment.js

@@ -1,5 +1,4 @@
-import { spawn } from "node:child_process";
-import { createConnection } from "node:net";
+import { createConnection, createServer } from "node:net";
 import { PORT_RANGES } from "./constants.js";
 function isPortAvailable(port) {
     return new Promise((resolve) => {
@@ -20,26 +19,20 @@ function isPortAvailable(port) {
 }
 export async function checkPortStatus(port) {
     return new Promise((resolve) => {
-        const child = spawn("lsof", ["-Pi", `:${port}`, "-sTCP:LISTEN"], {
-            timeout: 3000,
-            stdio: "pipe",
-        });
-        let hasOutput = false;
-        child.stdout?.on("data", () => {
-            hasOutput = true;
-        });
-        child.on("close", (code) => {
-            // lsof returns 0 if it found something, 1 if nothing found
-            if (code === 0) {
-                resolve("running");
-            }
-            else {
-                resolve(hasOutput ? "running" : "stopped");
-            }
-        });
-        child.on("error", () => {
+        const server = createServer();
+        const timer = setTimeout(() => {
+            server.close();
             resolve("unknown");
+        }, 3000);
+        server.once("error", (error) => {
+            clearTimeout(timer);
+            resolve(error.code === "EADDRINUSE" ? "running" : "unknown");
+        });
+        server.once("listening", () => {
+            clearTimeout(timer);
+            server.close(() => resolve("stopped"));
         });
+        server.listen(port, "127.0.0.1");
     });
 }
 export async function findAvailablePort(basePort, maxAttempts = 10) {

package/cli/dist/utils/project-templates.js

@@ -1,4 +1,4 @@
-/** Starter projects `tdk project <name>` can clone. Keep in sync with the public tdk-landscape examples. */
+/** Public starter repositories plus the bundled default product example. */
 export const PROJECT_TEMPLATES = {
     restaurant: {
         repo: "https://github.com/tdk-landscape/tdk-restaurant-example.git",
@@ -16,9 +16,14 @@ export const PROJECT_TEMPLATES = {
         repo: "https://github.com/tdk-landscape/tdk-user-management.git",
         description: "User/auth management services",
     },
+    ecommerce: {
+        repo: "https://github.com/tdk-landscape/tdk-ecommerce-example.git",
+        description: "Vue 3 storefront and Hono catalog API (needs TDK 1.3.75+ for --framework vue)",
+    },
     example: {
         repo: "https://github.com/tdk-landscape/tdk-example.git",
-        description: "Minimal Project-Stack-Resource (PSR) demonstration",
+        bundledPath: "examples/tdk-example",
+        description: "Hono + Postgres + NATS worker + Vite example with a routed write path",
     },
 };
 //# sourceMappingURL=project-templates.js.map

package/cli/dist/utils/resource-features.js

@@ -150,14 +150,18 @@ export const RESOURCE_FEATURES = {
         applies_to: ["backend", "frontend"],
         enabled_by_default: false,
         category: "premium",
-        generator_file: "engine/topologies/platform/docker/networking/sablier_container_cycle.star (stub; real generator in tdk-cli-extensions/premium/networking/), engine/topologies/platform/docker/networking/traefik.star, engine/topologies/platform/docker/compose/traefik_standalone.star (deferStart wake gateway + static route), engine/topologies/platform/docker/compose/compose.star (deferStart depends_on)",
-        output_file: "(Traefik + Sablier Docker labels on the resource's own compose service; with deferStart, also a generated Traefik file-provider dynamic-config entry and a depends_on block)",
+        generator_file: "engine/topologies/platform/docker/networking/sablier_container_cycle.star (stub; real generator in tdk-cli-extensions/premium/networking/), engine/topologies/platform/docker/networking/traefik.star, engine/topologies/platform/docker/compose/traefik_standalone.star (deferStart wake gateway + static route), engine/topologies/tilt/resources/orchestrator/apply_compose_resource_registration.star (deferred image prebuild + wake route wiring)",
+        output_file: "(Traefik + Sablier Docker labels on the resource's own compose service; with deferStart, also a generated Traefik file-provider dynamic-config entry, wake gateway, and image prebuild resource)",
     },
 };
 /**
  * Get default features for a resource type
  */
 export function getDefaultFeaturesForResourceType(appType) {
+    // bring-your-own doesn't generate application code, so no features
+    if (appType === "bring-your-own") {
+        return [];
+    }
     const defaults = [];
     for (const [key, feature] of Object.entries(RESOURCE_FEATURES)) {
         if (feature.enabled_by_default &&

package/cli/dist/utils/service-manifest.js

@@ -0,0 +1,73 @@
+import { existsSync, readFileSync } from "node:fs";
+export const SERVICE_MANIFEST_SCHEMA_VERSION = 1;
+const KNOWN_SERVICE_FIELDS = new Set([
+    "$schema",
+    "apiBasePath",
+    "appName",
+    "appType",
+    "backendName",
+    "basePath",
+    "build",
+    "databaseName",
+    "dependencies",
+    "dev",
+    "dependsOn",
+    "dockerfile",
+    "enabled",
+    "exposeViaProxy",
+    "featuresEnabled",
+    "framework",
+    "healthCheckPath",
+    "image",
+    "name",
+    "nats",
+    "params",
+    "playwright",
+    "port",
+    "replicas",
+    "runtime",
+    "sablier",
+    "schemaVersion",
+    "secrets",
+    "stack",
+    "syncs",
+    "traefik",
+    "type",
+]);
+export function validateServiceManifest(value, displayPath) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return { errors: [`${displayPath}: expected a JSON object`], warnings: [] };
+    }
+    const manifest = value;
+    const errors = [];
+    for (const field of ["appName", "appType", "stack", "schemaVersion"]) {
+        if (!(field in manifest))
+            errors.push(`${displayPath}.${field}: required field is missing`);
+    }
+    for (const field of ["appName", "appType", "stack"]) {
+        if (field in manifest && typeof manifest[field] !== "string") {
+            errors.push(`${displayPath}.${field}: expected a string`);
+        }
+    }
+    if ("schemaVersion" in manifest && manifest.schemaVersion !== SERVICE_MANIFEST_SCHEMA_VERSION) {
+        errors.push(`${displayPath}.schemaVersion: unsupported version ${String(manifest.schemaVersion)} (supported: ${SERVICE_MANIFEST_SCHEMA_VERSION})`);
+    }
+    const warnings = Object.keys(manifest)
+        .filter((field) => !KNOWN_SERVICE_FIELDS.has(field))
+        .map((field) => `${displayPath}.${field}: unknown field is preserved`);
+    return { errors, warnings, manifest };
+}
+export function validateServiceManifestFile(filePath, displayPath) {
+    if (!existsSync(filePath)) {
+        return { errors: [`${displayPath}: file is missing`], warnings: [] };
+    }
+    try {
+        const parsed = JSON.parse(readFileSync(filePath, "utf-8"));
+        return validateServiceManifest(parsed, displayPath);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return { errors: [`${displayPath}: invalid JSON (${message})`], warnings: [] };
+    }
+}
+//# sourceMappingURL=service-manifest.js.map

package/cli/dist/utils/services.js

@@ -4,6 +4,7 @@ import { Cache, createCacheValidator } from "./cache.js";
 import { AUTOGENERATED_FILE_PATTERNS, SKIP_DIRECTORIES } from "./constants.js";
 import { formatCount } from "./formatting.js";
 import { findProjectRoot } from "./paths.js";
+import { validateServiceManifest } from "./service-manifest.js";
 import { includes } from "./validation.js";
 const RESOURCE_JSON_FILENAME = "service.json";
 function findServiceJsonFiles(dir, maxDepth = 5, currentDepth = 0) {
@@ -25,6 +26,9 @@ function findServiceJsonFiles(dir, maxDepth = 5, currentDepth = 0) {
     }
     return results;
 }
+export function discoverServiceManifestPaths(projectRoot) {
+    return findServiceJsonFiles(projectRoot);
+}
 function shouldSkipDirectory(name) {
     return includes(SKIP_DIRECTORIES, name) || name.startsWith(".");
 }
@@ -45,6 +49,9 @@ function parseResource(serviceJsonPath) {
         throw new Error(`Invalid service.json at ${serviceJsonPath}: missing required fields (appName, runtime or appType)`);
     }
     const parsedConfig = parsed;
+    for (const warning of validateServiceManifest(parsed, serviceJsonPath).warnings) {
+        console.warn(`⚠️  Unknown service.json field: ${warning}`);
+    }
     const config = {
         ...parsedConfig,
         appType: (parsedConfig.appType ||
@@ -70,7 +77,7 @@ export function discoverResourcesFromRoot(projectRoot) {
 export function discoverResources() {
     const projectRoot = findProjectRoot();
     if (!projectRoot) {
-        throw new Error("Could not find project root (no Tiltfile found). Make sure you're in a root project.");
+        throw new Error("Could not find project root (no .tdk/project.json found). Run `tdk project --yes` first.");
     }
     return discoverResourcesFromRoot(projectRoot);
 }

package/cli/dist/utils/tar.js

@@ -1,5 +1,5 @@
 import { spawnSync } from "node:child_process";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, mkdtempSync, readdirSync, renameSync, rmSync, statSync, writeFileSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 /**
@@ -8,14 +8,36 @@ import { join } from "node:path";
  * implementation - available by default on macOS and Linux.
  */
 export function extractTarball(data, destDir) {
-    const tmpFile = join(mkdtempSync(join(tmpdir(), "tdk-ext-")), "bundle.tar.gz");
+    const tempDir = mkdtempSync(join(tmpdir(), "tdk-ext-"));
+    const tmpFile = join(tempDir, "bundle.tar.gz");
     writeFileSync(tmpFile, data);
-    const result = spawnSync("tar", ["xzf", tmpFile, "-C", destDir, "--strip-components=1"], {
+    mkdirSync(destDir, { recursive: true });
+    const tarBin = process.platform === "win32" ? "tar.exe" : "tar";
+    const result = spawnSync(tarBin, ["xzf", tmpFile, "-C", destDir, "--strip-components=1"], {
         stdio: "pipe",
+        windowsHide: true,
     });
-    rmSync(join(tmpFile, ".."), { recursive: true, force: true });
     if (result.status !== 0) {
-        throw new Error(`tar extraction failed: ${result.stderr?.toString() || "unknown error"}`);
+        const fallbackDir = join(tempDir, "fallback");
+        mkdirSync(fallbackDir, { recursive: true });
+        const fallback = spawnSync(tarBin, ["xzf", tmpFile, "-C", fallbackDir], {
+            stdio: "pipe",
+            windowsHide: true,
+        });
+        if (fallback.status !== 0) {
+            rmSync(tempDir, { recursive: true, force: true });
+            throw new Error(`tar extraction failed: ${fallback.stderr?.toString() || result.stderr?.toString() || "unknown error"}`);
+        }
+        const entries = readdirSync(fallbackDir);
+        const sourceDir = entries.length === 1 &&
+            existsSync(join(fallbackDir, entries[0])) &&
+            statSync(join(fallbackDir, entries[0])).isDirectory()
+            ? join(fallbackDir, entries[0])
+            : fallbackDir;
+        for (const entry of readdirSync(sourceDir)) {
+            renameSync(join(sourceDir, entry), join(destDir, entry));
+        }
     }
+    rmSync(tempDir, { recursive: true, force: true });
 }
 //# sourceMappingURL=tar.js.map

package/cli/dist/utils/tilt-process.js

@@ -0,0 +1,53 @@
+import { execFileSync } from "node:child_process";
+const run = (command, args) => execFileSync(command, args, { encoding: "utf-8", stdio: "pipe", windowsHide: true });
+/** Refuse to target arbitrary listeners: only stop a Tilt process on the requested UI port. */
+export function findTiltProcessIdsOnPort(port, platform = process.platform, commandRunner = run) {
+    if (!Number.isInteger(port) || port < 1 || port > 65535)
+        return [];
+    if (platform === "win32") {
+        const script = `$port=${port}; Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue | ForEach-Object { $p=Get-Process -Id $_.OwningProcess -ErrorAction SilentlyContinue; if ($p -and $p.ProcessName -eq 'tilt') { $_.OwningProcess } } | Sort-Object -Unique`;
+        try {
+            return commandRunner("powershell.exe", ["-NoProfile", "-Command", script])
+                .split(/\s+/)
+                .map(Number)
+                .filter((pid) => Number.isInteger(pid) && pid > 0);
+        }
+        catch {
+            throw new Error(`Unable to inspect Tilt listeners on port ${port} with PowerShell.`);
+        }
+    }
+    let pids;
+    try {
+        pids = commandRunner("lsof", ["-nP", "-t", `-iTCP:${port}`, "-sTCP:LISTEN"])
+            .split(/\s+/)
+            .map(Number)
+            .filter((pid) => Number.isInteger(pid) && pid > 0);
+    }
+    catch (err) {
+        const commandErr = err;
+        const stderr = commandErr.stderr?.toString().trim();
+        if (commandErr?.status === 1 && !stderr)
+            return [];
+        throw new Error(`Unable to inspect listeners on port ${port}. Install lsof or resolve the lsof error before using --force.`, { cause: commandErr });
+    }
+    return pids.filter((pid) => {
+        try {
+            const name = commandRunner("ps", ["-p", String(pid), "-o", "comm="]).trim();
+            return name.split(/[\\/]/).at(-1) === "tilt";
+        }
+        catch (err) {
+            throw new Error(`Unable to identify the process listening on port ${port}.`, { cause: err });
+        }
+    });
+}
+export function stopTiltOnPort(port, platform = process.platform, commandRunner = run) {
+    const pids = findTiltProcessIdsOnPort(port, platform, commandRunner);
+    for (const pid of pids) {
+        if (platform === "win32")
+            commandRunner("taskkill.exe", ["/PID", String(pid), "/F"]);
+        else
+            commandRunner("kill", ["-TERM", String(pid)]);
+    }
+    return pids;
+}
+//# sourceMappingURL=tilt-process.js.map

package/cli/dist/utils/tilt.js

@@ -1,15 +1,17 @@
 import { spawn } from "node:child_process";
 import { join } from "node:path";
 import { findProjectRoot } from "./paths.js";
+import { findOnPath } from "./which.js";
 export function runTilt(command, args = [], options = {}) {
     return new Promise((resolve, reject) => {
         const tiltArgs = [command, ...args];
         if (options.verbose) {
             console.log(`Executing: tilt ${tiltArgs.join(" ")}`);
         }
-        const child = spawn("tilt", tiltArgs, {
+        const child = spawn(findOnPath("tilt") ?? "tilt", tiltArgs, {
             stdio: options.inheritStdio ? "inherit" : "pipe",
             shell: false,
+            windowsHide: process.platform === "win32",
             timeout: options.timeoutMs,
         });
         let stdout = "";

package/cli/dist/utils/which.js

@@ -0,0 +1,26 @@
+import { existsSync } from "node:fs";
+import { delimiter, extname, join } from "node:path";
+import { isWindows, pathLookups } from "./platform.js";
+export function findOnPath(command) {
+    const pathEnv = process.env.PATH ?? process.env.Path ?? "";
+    const windows = isWindows();
+    const names = pathLookups(command, windows);
+    if (windows && !extname(command)) {
+        for (const extension of (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";")) {
+            const suffix = extension.toLowerCase();
+            if (suffix && !names.includes(`${command}${suffix}`))
+                names.push(`${command}${suffix}`);
+        }
+    }
+    for (const dir of pathEnv.split(delimiter)) {
+        if (!dir)
+            continue;
+        for (const name of names) {
+            const candidate = join(dir, name);
+            if (existsSync(candidate))
+                return candidate;
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=which.js.map