@tdk-landscape/tdk-cli-core 1.3.79 → 1.3.81

package/cli/dist/commands/doctor.js

@@ -6,11 +6,14 @@ import { Command } from "commander";
 import { hasVerdaccioLicense } from "../generator/extension-fetch.js";
 import { MASTER_CONFIG_FILES, REQUIRED_PACKAGE_SCRIPTS } from "../utils/constants.js";
 import { isPathDiscovered, readDiscoveryPaths } from "../utils/discovery-paths.js";
-import { checkHealthRoutes, checkHostPorts, checkIngressPorts, checkPrivateNpmRegistry, checkTiltResourceHealth, projectConfigEnablesVerdaccio, summarizeServiceProbes, } from "../utils/doctor-runtime.js";
+import { collectDoctorChecks, createDoctorReport, getDoctorExitCode, } from "../utils/doctor-report.js";
+import { checkHealthRoutes, checkIngressPorts, checkPrivateNpmRegistry, checkTiltResourceHealth, projectConfigEnablesVerdaccio, summarizeServiceProbes, } from "../utils/doctor-runtime.js";
 import { checkDockerNetworkCapacity, checkFrontendBackendUrls, checkNatsBroker, checkResourcePackageJson, checkServiceUrlPorts, checkTiltInstances, } from "../utils/doctor-wiring.js";
 import { validateEnvFile } from "../utils/env-validator.js";
 import { execAsync, isExecTimeout } from "../utils/exec-async.js";
 import { formatCount } from "../utils/formatting.js";
+import { getHostPortPlan } from "../utils/host-port-config.js";
+import { createHostPortPlan } from "../utils/host-port-plan.js";
 import { findProjectRoot } from "../utils/paths.js";
 import { buildHealthTargets, pingHealthTargets } from "../utils/service-urls.js";
 import { discoverResourcesFromRoot } from "../utils/services.js";
@@ -66,8 +69,8 @@ export function checkWslProjectLocation(projectPath, strict, isWsl = process.pla
 }
 /** Failures are shown before passing statuses, with a 5432 conflict first. */
 export function orderDoctorResults(results) {
-    const failures = results.filter((result) => !result.didPass && !result.isSkipped);
-    const remaining = results.filter((result) => result.didPass || result.isSkipped);
+    const failures = results.filter((result) => !result.didPass && !result.isSkipped && !result.isWarning);
+    const remaining = results.filter((result) => result.didPass || result.isSkipped || result.isWarning);
     failures.sort((left, right) => {
         const rank = (result) => result.name === "Host Ports" && /\b5432\b/.test(result.message)
             ? 0
@@ -953,9 +956,9 @@ const DEFAULT_PING_TIMEOUT_MS = 5000;
  * it catches the case where a container is running but Traefik never routed
  * to it, which `docker ps` alone will not show.
  */
-async function checkServiceHealth(timeoutMs) {
+async function checkServiceHealth(timeoutMs, ingressPort) {
     const projectRoot = findProjectRoot() ?? process.cwd();
-    const targets = buildHealthTargets(discoverResourcesFromRoot(projectRoot));
+    const targets = buildHealthTargets(discoverResourcesFromRoot(projectRoot), ingressPort);
     if (targets.length === 0) {
         return {
             name: "Service Health",
@@ -968,25 +971,93 @@ async function checkServiceHealth(timeoutMs) {
 }
 export const doctorCommand = new Command("doctor")
     .description("Check environment readiness for TDK")
+    .option("--json", "Output a versioned JSON readiness report", false)
+    .exitOverride((error) => {
+    if (error.exitCode === 0)
+        process.exit(0);
+    if (doctorCommand.opts().json) {
+        console.log(JSON.stringify(createDoctorReport([], false, [{ code: "USAGE", message: error.message }])));
+    }
+    process.exit(2);
+})
     .option("--no-ping", "Skip pinging running services' /health endpoints")
     .option("--strict", "Fail warnings such as a WSL project under /mnt/c")
     .option("--ping-timeout <ms>", "Per-service ping timeout in milliseconds", String(DEFAULT_PING_TIMEOUT_MS))
     .action(async (options) => {
+    // Validate before running any probe; parseInt would silently accept "100ms" or "1.5".
+    const pingTimeout = Number(options.pingTimeout);
+    if (!/^\d+$/.test(options.pingTimeout) ||
+        !Number.isSafeInteger(pingTimeout) ||
+        pingTimeout <= 0) {
+        const message = "--ping-timeout must be a positive integer number of milliseconds";
+        if (options.json)
+            console.log(JSON.stringify(createDoctorReport([], false, [{ code: "USAGE", message }])));
+        console.error(message);
+        process.exit(2);
+        return;
+    }
+    if (!options.json) {
+        console.log("TDK doctor checks your local Docker + Tilt development environment; it does not check cluster deployments.");
+    }
     if (process.platform === "win32") {
+        if (options.json) {
+            let windowsPortPlan = null;
+            try {
+                windowsPortPlan = await createHostPortPlan();
+            }
+            catch {
+                /* The native-Windows platform finding remains the primary failure. */
+            }
+            console.log(JSON.stringify(createDoctorReport([
+                {
+                    name: "Native Windows support",
+                    didPass: false,
+                    message: NATIVE_WINDOWS_DOCTOR_MESSAGE,
+                    fix: "Use WSL2 Ubuntu with Docker Desktop integration. Guide: docs/wsl2.md",
+                },
+            ], Boolean(findProjectRoot()), [], windowsPortPlan)));
+        }
         console.error(NATIVE_WINDOWS_DOCTOR_MESSAGE);
         process.exit(1);
         return;
     }
-    console.log(`\n${chalk.bold("🔍 TDK Doctor")}\n`);
-    console.log("Checking environment...\n");
-    const pingTimeout = Number.parseInt(options.pingTimeout, 10);
-    if (!Number.isFinite(pingTimeout) || pingTimeout <= 0) {
-        console.log(`${chalk.red("✗")} --ping-timeout must be a positive number of milliseconds`);
-        process.exit(1);
+    if (!options.json) {
+        console.log(`\n${chalk.bold("🔍 TDK Doctor")}\n`);
+        console.log("Checking environment...\n");
+    }
+    const projectRoot = findProjectRoot();
+    let hostPortPlan;
+    let portPlanError;
+    try {
+        hostPortPlan = await getHostPortPlan(projectRoot ?? process.cwd());
+    }
+    catch (error) {
+        hostPortPlan = null;
+        portPlanError = error instanceof Error ? error.message : String(error);
     }
     const machineChecks = [
-        () => checkHostPorts(),
-        () => checkIngressPorts(),
+        () => hostPortPlan
+            ? {
+                name: "Host Ports",
+                didPass: true,
+                message: `HTTP ${hostPortPlan.ingressHttp}, HTTPS ${hostPortPlan.ingressHttps}, Postgres ${hostPortPlan.postgres}`,
+            }
+            : {
+                name: "Host Ports",
+                didPass: false,
+                message: portPlanError ?? "Could not select host ports",
+                fix: "Set TDK_HTTP_PORT, TDK_HTTPS_PORT, or TDK_POSTGRES_PORT to available host ports.",
+            },
+        () => hostPortPlan
+            ? checkIngressPorts(execSync, undefined, [
+                hostPortPlan.ingressHttp,
+                hostPortPlan.ingressHttps,
+            ])
+            : {
+                name: "Ingress Ports",
+                didPass: false,
+                message: "Ingress port plan is unavailable",
+            },
         checkDockerRuntime,
         checkDockerOperatingSystem,
         checkTilt,
@@ -1029,26 +1100,28 @@ export const doctorCommand = new Command("doctor")
     ];
     // Runs last: needs routable services (and working Traefik) to mean anything.
     if (options.ping) {
-        projectChecks.push(() => checkServiceHealth(pingTimeout));
+        projectChecks.push(() => checkServiceHealth(pingTimeout, hostPortPlan?.ingressHttp));
     }
     // Right after installing, people run `tdk doctor` before they have a
     // project. Only the machine checks mean anything there; the project checks
     // would all fail with "run tdk project".
-    const inProject = Boolean(findProjectRoot());
-    const checks = inProject ? [...machineChecks, ...projectChecks] : [...machineChecks];
-    // Machine checks are independent and mostly wait on child processes, so run
-    // them concurrently. Project checks stay sequential; rendering ranks failures first.
-    const startedMachineChecks = machineChecks.map((checkFn) => Promise.resolve().then(checkFn));
-    const results = [];
-    for (const [index, checkFn] of checks.entries()) {
-        const result = await (startedMachineChecks[index] ?? checkFn());
-        results.push(result);
-    }
-    // Let machine checks finish before process.exit so their probes can clean up.
-    await Promise.allSettled(startedMachineChecks);
-    const allPassed = results.every((result) => result.didPass || result.isSkipped);
+    const inProject = Boolean(projectRoot);
+    const { checks: results, errors } = await collectDoctorChecks(machineChecks, inProject ? projectChecks : []);
+    const report = createDoctorReport(orderDoctorResults(results), inProject, errors, hostPortPlan);
+    const exitCode = getDoctorExitCode(report);
+    const allPassed = report.data.ready;
+    if (options.json) {
+        console.log(JSON.stringify(report));
+        for (const error of errors)
+            console.error(error.message);
+        if (exitCode !== 0)
+            process.exit(exitCode);
+        return;
+    }
+    for (const error of errors)
+        console.error(`${chalk.red("✗")} Doctor check failed: ${error.message}`);
     for (const result of orderDoctorResults(results)) {
-        if (!result.didPass && !result.isSkipped) {
+        if (!result.didPass && !result.isSkipped && !result.isWarning) {
             console.log(`${chalk.red("✗")} ${result.message}`);
             if (result.fix)
                 console.log(`${chalk.blue("ℹ")} Fix: ${result.fix}`);
@@ -1074,7 +1147,7 @@ export const doctorCommand = new Command("doctor")
     }
     const outcome = getDoctorOutcomeMessage(inProject, allPassed);
     console.log(`${allPassed ? chalk.green(chalk.bold("✓")) : chalk.red(chalk.bold("✗"))} ${outcome}`);
-    if (!allPassed)
-        process.exit(1);
+    if (exitCode !== 0)
+        process.exit(exitCode);
 });
 //# sourceMappingURL=doctor.js.map

package/cli/dist/commands/help.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import pkg from "../../package.json" with { type: "json" };
 const TDK_BANNER = `
-  ${chalk.bold.cyan("tdk")} ${chalk.gray(`v${pkg.version}`)}  ${chalk.white("Tilt Development Kit: run your microservices locally")}
+  ${chalk.bold.cyan("tdk")} ${chalk.gray(`v${pkg.version}`)}  ${chalk.white("TDK runs many services locally with Docker + Tilt; Helm deploys the cluster")}
 `;
 const COMMAND_GROUPS = [
     {
@@ -63,6 +63,11 @@ const COMMAND_GROUPS = [
                 alias: "regenerate, verify, edit",
             },
             { name: "doctor", desc: "Check environment readiness", alias: "" },
+            {
+                name: "runtime",
+                desc: "Inspect packaged engine and template assets",
+                alias: "--check-assets",
+            },
             { name: "completion", desc: "Generate shell completions", alias: "--install --shell zsh" },
             { name: "upgrade, update", desc: "Self-update to latest version", alias: "--force" },
             { name: "version, -v", desc: "Display version number", alias: "" },
@@ -78,7 +83,8 @@ function formatCommand(name, desc, alias, color) {
 }
 export function showHelp() {
     console.log(TDK_BANNER);
-    console.log(chalk.bold.white("\n  Project → Phase → Stack → Resource\n"));
+    console.log(chalk.gray("\n  Local development inner loop; TDK does not replace Helm for cluster deployments.\n"));
+    console.log(chalk.bold.white("  Project → Phase → Stack → Resource\n"));
     console.log(chalk.gray("  Usage: tdk [command] [options]\n"));
     console.log(chalk.bold.yellow("  Global Options:"));
     console.log(`  ${chalk.cyan("-v, --version".padEnd(20))} ${chalk.white("Display version number")}`);

package/cli/dist/commands/networks.js

@@ -6,6 +6,9 @@ import { getStackEmoji } from "../utils/constants.js";
 import { createDiscoveryContext } from "../utils/discovery-context.js";
 import { logVerbose, requireProjectRoot } from "../utils/errors.js";
 import { colorizeByStatus, DEFAULT_BOX_WIDTH, formatBoxLine, formatPadded, getStatusIcon, printBoxedHeader, } from "../utils/formatting.js";
+import { readSavedHostPortPlan } from "../utils/host-port-config.js";
+import { createHostPortPlan } from "../utils/host-port-plan.js";
+import { createMachineEnvelope, writeMachineError } from "../utils/machine-output.js";
 import { findProjectRoot } from "../utils/paths.js";
 import { checkPortStatus } from "../utils/port-assignment.js";
 import { isValidPort, sanitizeForShell } from "../utils/validation.js";
@@ -156,118 +159,140 @@ export const networksCommand = new Command("networks")
     .alias("urls")
     .alias("traefik")
     .option("-s, --stack <stack>", "Filter by stack name")
-    .option("--json", "Output as JSON")
+    .option("--json", "Output a versioned JSON response")
+    .option("--json-legacy", "Output the legacy JSON array (deprecated)")
     .option("--raw", "Output raw URLs only")
     .action(async (options) => {
-    const projectRoot = requireProjectRoot();
-    const discovery = createDiscoveryContext();
-    const baseDomain = determineDefaultDomain();
-    const bareDomain = baseDomain.replace(/^(app|api)\./, "");
-    const appDomain = `app.${bareDomain}`;
-    const apiDomain = `api.${bareDomain}`;
-    const services = discovery.resources;
-    const servicesWithUrls = await Promise.all(services
-        .filter((s) => typeof s.config?.basePath === "string")
-        .map(async (s) => {
-        const basePath = s.config.basePath.replace(/^\//, "");
-        const isBackend = s.config?.appType === "backend";
-        const host = isBackend ? apiDomain : appDomain;
-        const url = `http://${host}/${basePath}`;
-        const port = s.config.port;
-        const status = await checkServiceStatus(s.name, port, url);
-        return {
-            name: s.name,
-            stack: s.stack,
-            basePath: s.config.basePath,
-            url,
-            ...(process.platform === "win32"
-                ? { loopbackUrl: `http://127.0.0.1:80/${basePath}`.replace(/\/$/, "") }
-                : {}),
-            port,
-            status,
-        };
-    }));
-    const filteredServices = options.stack
-        ? servicesWithUrls.filter((s) => s.stack === options.stack)
-        : servicesWithUrls;
-    if (filteredServices.length === 0) {
-        if (options.stack) {
-            console.log(chalk.yellow(`⚠️ No services with basePath found in stack "${options.stack}"`));
+    const action = async () => {
+        const projectRoot = options.json || options.jsonLegacy ? findProjectRoot() : requireProjectRoot();
+        if (!projectRoot) {
+            throw new Error("Could not find project root (no .tdk/project.json found)");
         }
-        else {
-            console.log(chalk.yellow("⚠️ No services with basePath found"));
-            console.log(chalk.gray("\nAdd basePath to your service.json:"));
-            console.log(chalk.gray('  "basePath": "/my-service"'));
+        const savedPlan = readSavedHostPortPlan(projectRoot);
+        const hostPortPlan = savedPlan ?? (await createHostPortPlan());
+        const httpPort = hostPortPlan.ingressHttp;
+        const discovery = createDiscoveryContext();
+        const baseDomain = determineDefaultDomain();
+        const bareDomain = baseDomain.replace(/^(app|api)\./, "");
+        const appDomain = `app.${bareDomain}`;
+        const apiDomain = `api.${bareDomain}`;
+        const services = discovery.resources;
+        const servicesWithUrls = await Promise.all(services
+            .filter((s) => typeof s.config?.basePath === "string")
+            .map(async (s) => {
+            const basePath = s.config.basePath.replace(/^\//, "");
+            const isBackend = s.config?.appType === "backend";
+            const host = isBackend ? apiDomain : appDomain;
+            const url = `http://${host}:${httpPort}/${basePath}`;
+            const port = s.config.port;
+            const status = await checkServiceStatus(s.name, port, url);
+            return {
+                name: s.name,
+                stack: s.stack,
+                basePath: s.config.basePath,
+                url,
+                ...(process.platform === "win32"
+                    ? { loopbackUrl: `http://127.0.0.1:${httpPort}/${basePath}`.replace(/\/$/, "") }
+                    : {}),
+                port,
+                status,
+            };
+        }));
+        const filteredServices = options.stack
+            ? servicesWithUrls.filter((s) => s.stack === options.stack)
+            : servicesWithUrls;
+        if (options.json || options.jsonLegacy) {
+            const output = options.jsonLegacy
+                ? filteredServices
+                : createMachineEnvelope({ services: filteredServices });
+            console.log(JSON.stringify(output, null, 2));
+            return;
         }
-        process.exit(0);
-    }
-    if (options.json) {
-        console.log(JSON.stringify(filteredServices, null, 2));
-        process.exit(0);
-    }
-    if (options.raw) {
-        for (const service of filteredServices) {
-            console.log(service.url);
-            if (service.loopbackUrl)
-                console.log(service.loopbackUrl);
+        if (filteredServices.length === 0) {
+            if (options.stack) {
+                console.log(chalk.yellow(`⚠️ No services with basePath found in stack "${options.stack}"`));
+            }
+            else {
+                console.log(chalk.yellow("⚠️ No services with basePath found"));
+                console.log(chalk.gray("\nAdd basePath to your service.json:"));
+                console.log(chalk.gray('  "basePath": "/my-service"'));
+            }
+            process.exit(0);
         }
-        process.exit(0);
-    }
-    printBoxedHeader("🌐  TRAEFIK NETWORKS", `Domain: http://${baseDomain}`, DEFAULT_BOX_WIDTH);
-    // Group services by stack using discovery context's stack names for consistent ordering
-    const stacks = new Map();
-    for (const stackName of discovery.stackNames) {
-        const stackServices = filteredServices.filter((s) => s.stack === stackName);
-        if (stackServices.length > 0) {
-            stacks.set(stackName, stackServices);
+        if (options.raw) {
+            for (const service of filteredServices) {
+                console.log(service.url);
+                if (service.loopbackUrl)
+                    console.log(service.loopbackUrl);
+            }
+            process.exit(0);
         }
-    }
-    // Add unstacked services to 'default' group
-    const unstackedServices = filteredServices.filter((s) => !s.stack);
-    if (unstackedServices.length > 0) {
-        stacks.set("default", unstackedServices);
-    }
-    let isFirstStack = true;
-    for (const [stackName, stackServices] of stacks) {
-        if (!isFirstStack) {
+        printBoxedHeader("🌐  TRAEFIK NETWORKS", `Domain: http://${baseDomain}:${httpPort}`, DEFAULT_BOX_WIDTH);
+        // Group services by stack using discovery context's stack names for consistent ordering
+        const stacks = new Map();
+        for (const stackName of discovery.stackNames) {
+            const stackServices = filteredServices.filter((s) => s.stack === stackName);
+            if (stackServices.length > 0) {
+                stacks.set(stackName, stackServices);
+            }
+        }
+        // Add unstacked services to 'default' group
+        const unstackedServices = filteredServices.filter((s) => !s.stack);
+        if (unstackedServices.length > 0) {
+            stacks.set("default", unstackedServices);
+        }
+        let isFirstStack = true;
+        for (const [stackName, stackServices] of stacks) {
+            if (!isFirstStack) {
+                console.log();
+            }
+            isFirstStack = false;
+            const emoji = getStackEmoji(stackName);
+            const stackTitle = `${emoji}  ${stackName.toUpperCase()} STACK`;
             console.log();
+            console.log(chalk.bold.white(stackTitle));
+            console.log(chalk.gray(formatBoxLine("━", DEFAULT_BOX_WIDTH - 4)));
+            for (const service of stackServices) {
+                const statusSymbol = getStatusIcon(service.status);
+                const statusEmoji = colorizeByStatus(statusSymbol, service.status);
+                const namePart = formatPadded(service.name, 22);
+                const urlPart = service.status === "running"
+                    ? chalk.cyan.underline(service.url)
+                    : chalk.gray(service.url); // Gray out URL if stopped
+                const statusLabel = service.status !== "running" ? chalk.gray(` [${service.status}]`) : "";
+                console.log(`  ${statusEmoji} ${chalk.white(namePart)}  ${urlPart}${statusLabel}`);
+                if (service.loopbackUrl) {
+                    console.log(`     ${chalk.gray(`Loopback: ${service.loopbackUrl} (Host: ${new URL(service.url).hostname})`)}`);
+                }
+            }
         }
-        isFirstStack = false;
-        const emoji = getStackEmoji(stackName);
-        const stackTitle = `${emoji}  ${stackName.toUpperCase()} STACK`;
         console.log();
-        console.log(chalk.bold.white(stackTitle));
-        console.log(chalk.gray(formatBoxLine("━", DEFAULT_BOX_WIDTH - 4)));
-        for (const service of stackServices) {
-            const statusSymbol = getStatusIcon(service.status);
-            const statusEmoji = colorizeByStatus(statusSymbol, service.status);
-            const namePart = formatPadded(service.name, 22);
-            const urlPart = service.status === "running"
-                ? chalk.cyan.underline(service.url)
-                : chalk.gray(service.url); // Gray out URL if stopped
-            const statusLabel = service.status !== "running" ? chalk.gray(` [${service.status}]`) : "";
-            console.log(`  ${statusEmoji} ${chalk.white(namePart)}  ${urlPart}${statusLabel}`);
-            if (service.loopbackUrl) {
-                console.log(`     ${chalk.gray(`Loopback: ${service.loopbackUrl} (Host: ${new URL(service.url).hostname})`)}`);
-            }
+        console.log(chalk.gray(formatBoxLine("─", DEFAULT_BOX_WIDTH - 2)));
+        console.log(chalk.gray("🖱️  Click any URL above to open in browser"));
+        console.log(chalk.gray("📊 Status: ") +
+            chalk.green("✓ Running") +
+            " | " +
+            chalk.red("✗ Stopped") +
+            " | " +
+            chalk.gray("? Unknown"));
+        if (baseDomain === "localhost") {
+            console.log();
+            const projectConfig = readProjectConfig(projectRoot);
+            const projectName = projectConfig.project.name;
+            console.log(chalk.yellow("💡 Tip: Set custom domain with:"));
+            console.log(chalk.cyan(`   export TDK_PUBLIC_HOST=${projectName}.localhost`));
         }
-    }
-    console.log();
-    console.log(chalk.gray(formatBoxLine("─", DEFAULT_BOX_WIDTH - 2)));
-    console.log(chalk.gray("🖱️  Click any URL above to open in browser"));
-    console.log(chalk.gray("📊 Status: ") +
-        chalk.green("✓ Running") +
-        " | " +
-        chalk.red("✗ Stopped") +
-        " | " +
-        chalk.gray("? Unknown"));
-    if (baseDomain === "localhost") {
         console.log();
-        const projectConfig = readProjectConfig(projectRoot);
-        const projectName = projectConfig.project.name;
-        console.log(chalk.yellow("💡 Tip: Set custom domain with:"));
-        console.log(chalk.cyan(`   export TDK_PUBLIC_HOST=${projectName}.localhost`));
+    };
+    if (options.json || options.jsonLegacy) {
+        try {
+            await action();
+        }
+        catch (error) {
+            writeMachineError(error);
+        }
+        return;
     }
-    console.log();
+    await action();
 });
 //# sourceMappingURL=networks.js.map

package/cli/dist/commands/resource.js

@@ -13,7 +13,7 @@ import { showCommandHeader } from "../utils/formatting.js";
 import { assignPort } from "../utils/port-assignment.js";
 import { promptSelect, promptText } from "../utils/prompt.js";
 import { getDefaultFeaturesForResourceType } from "../utils/resource-features.js";
-import { SERVICE_MANIFEST_SCHEMA_VERSION } from "../utils/service-manifest.js";
+import { SERVICE_MANIFEST_SCHEMA_URL, SERVICE_MANIFEST_SCHEMA_VERSION, } from "../utils/service-manifest.js";
 import { discoverResources } from "../utils/services.js";
 import { createKebabCaseValidator, isPathSafe, validateResourceName } from "../utils/validation.js";
 export const BASE_TEMPLATE = {
@@ -77,6 +77,7 @@ export function createServiceJson(name, type, stack, port, extraFeatures = [], f
     }
     return {
         ...base,
+        $schema: SERVICE_MANIFEST_SCHEMA_URL,
         schemaVersion: SERVICE_MANIFEST_SCHEMA_VERSION,
         appName: name,
         appType: type,
@@ -494,6 +495,7 @@ export const resourceCommand = new Command("resource")
             // Update with new values while preserving existing fields
             const updatedServiceJson = {
                 ...existingServiceJson,
+                $schema: existingServiceJson.$schema ?? SERVICE_MANIFEST_SCHEMA_URL,
                 schemaVersion: existingServiceJson.schemaVersion ?? SERVICE_MANIFEST_SCHEMA_VERSION,
                 appName: resourceName,
                 appType: resourceType === "sdk" ? "sdk" : existingServiceJson.appType || resourceType,
@@ -525,6 +527,7 @@ export const resourceCommand = new Command("resource")
             mkdirSync(fullPath, { recursive: true });
             // Create service.json
             const byoServiceJson = {
+                $schema: SERVICE_MANIFEST_SCHEMA_URL,
                 schemaVersion: SERVICE_MANIFEST_SCHEMA_VERSION,
                 appName: resourceName,
                 appType: "bring-your-own",

package/cli/dist/commands/resources.js

@@ -3,35 +3,56 @@ import { Command } from "commander";
 import { createDiscoveryContext } from "../utils/discovery-context.js";
 import { requireProjectRoot, runCommand } from "../utils/errors.js";
 import { formatCount, showAllSatisfyCondition, showDetail, showEmptyState, showStep, } from "../utils/formatting.js";
+import { createMachineEnvelope, writeMachineError } from "../utils/machine-output.js";
+import { findProjectRoot } from "../utils/paths.js";
 export const resourcesCommand = new Command("resources")
     .description("List all resources (services) in the project")
     .option("-v, --verbose", "Show detailed information about each resource", false)
     .option("-s, --stack <stack>", "Filter resources by stack name")
     .option("--no-stack", "Show only resources without a stack")
     .option("--ports", "Show port assignments", false)
+    .option("--json", "Output a versioned JSON resource report", false)
     .action(async (options) => {
-    await runCommand(async () => {
-        requireProjectRoot();
-        const discovery = createDiscoveryContext();
-        if (discovery.resources.length === 0) {
-            showEmptyState("resources");
-            return;
+    const action = async () => {
+        if (options.json) {
+            if (!findProjectRoot()) {
+                writeMachineError(new Error("Could not find project root (no .tdk/project.json found)"));
+            }
         }
+        else {
+            requireProjectRoot();
+        }
+        const discovery = createDiscoveryContext();
         let resources = discovery.resources;
         if (options.stack) {
             resources = discovery.resourcesByStack.get(options.stack) || [];
-            if (resources.length === 0) {
+            if (resources.length === 0 && !options.json) {
                 showEmptyState("stack-services", ` in stack "${options.stack}"`);
                 return;
             }
         }
         if (options.noStack) {
             resources = discovery.unassignedResources;
-            if (resources.length === 0) {
+            if (resources.length === 0 && !options.json) {
                 showAllSatisfyCondition("resources", "assigned to a stack");
                 return;
             }
         }
+        if (options.json) {
+            const data = resources.map((resource) => ({
+                name: resource.name,
+                stack: resource.stack ?? null,
+                type: resource.config?.appType ?? resource.type ?? "unknown",
+                port: resource.port ?? null,
+                path: resource.configPath,
+            }));
+            console.log(JSON.stringify(createMachineEnvelope({ resources: data })));
+            return;
+        }
+        if (resources.length === 0) {
+            showEmptyState(options.stack ? "stack-services" : "resources", options.stack ? ` in stack "${options.stack}"` : "");
+            return;
+        }
         showStep(`Found ${formatCount(resources.length, "resource")}:\n`);
         if (options.verbose || options.ports) {
             for (const resource of resources) {
@@ -68,6 +89,16 @@ export const resourcesCommand = new Command("resources")
             console.log(chalk.yellow(`\n${formatCount(withoutStackCount, "resource")} not assigned to any stack.`));
             showDetail('Run "tdk resources --no-stack" to see them, or "tdk stack" to assign them.');
         }
-    });
+    };
+    if (options.json) {
+        try {
+            await action();
+        }
+        catch (error) {
+            writeMachineError(error);
+        }
+        return;
+    }
+    await runCommand(action);
 });
 //# sourceMappingURL=resources.js.map