@tdk-landscape/tdk-cli-core 1.3.107 → 1.3.109

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@tdk-landscape/tdk-cli-core.svg?style=flat&color=blue)](https://www.npmjs.com/package/@tdk-landscape/tdk-cli-core)
 [![unpacked size](https://img.shields.io/npm/unpacked-size/@tdk-landscape/tdk-cli-core)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core)
-[![install size](https://packagephobia.com/badge?p=@tdk-landscape/tdk-cli-core)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core)
+[![install size](https://badgen.net/packagephobia/install/@tdk-landscape/tdk-cli-core)](https://packagephobia.com/result?p=@tdk-landscape/tdk-cli-core)
 [![CI](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/ci.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/ci.yml)
 [![Quickstart E2E](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/quickstart-e2e.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/quickstart-e2e.yml)
 [![ERP fixture scale E2E](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/erp-scale-e2e.yml/badge.svg)](https://github.com/tdk-landscape/tdk-cli-core/actions/workflows/erp-scale-e2e.yml)

package/cli/dist/commands/__tests__/ui-loading-screen.test.js

@@ -0,0 +1,16 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { renderToString } from "ink";
+import { describe, expect, it } from "vitest";
+import { LoadingScreen } from "../ui.js";
+describe("ui LoadingScreen", () => {
+    it("shows honest text with no percentage", () => {
+        const out = renderToString(_jsx(LoadingScreen, { animated: false }));
+        expect(out).toContain("Discovering resources...");
+        expect(out).not.toContain("%");
+    });
+    it("renders a spinner frame only when animated", () => {
+        expect(renderToString(_jsx(LoadingScreen, { animated: true }))).toMatch(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏] Discovering/);
+        expect(renderToString(_jsx(LoadingScreen, { animated: false }))).not.toMatch(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/);
+    });
+});
+//# sourceMappingURL=ui-loading-screen.test.js.map

package/cli/dist/commands/networks.js

@@ -4,7 +4,7 @@ import { Command } from "commander";
 import { readProjectConfig } from "../generator/template-engine.js";
 import { getStackEmoji } from "../utils/constants.js";
 import { createDiscoveryContext } from "../utils/discovery-context.js";
-import { logVerbose, requireProjectRoot } from "../utils/errors.js";
+import { errorFactories, 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";
@@ -12,6 +12,7 @@ import { createMachineEnvelope, writeMachineError } from "../utils/machine-outpu
 import { findProjectRoot } from "../utils/paths.js";
 import { checkPortStatus } from "../utils/port-assignment.js";
 import { isApiServiceType } from "../utils/resource-kind.js";
+import { stackExists } from "../utils/services.js";
 import { isValidPort, sanitizeForShell } from "../utils/validation.js";
 import { findOnPath } from "../utils/which.js";
 function execSafe(command, args, options = {}) {
@@ -169,10 +170,16 @@ export const networksCommand = new Command("networks")
         if (!projectRoot) {
             throw new Error("Could not find project root (no .tdk/project.json found)");
         }
+        const discovery = createDiscoveryContext();
+        if (options.stack && !stackExists(options.stack, discovery.resources)) {
+            const error = errorFactories.stackNotFound(options.stack);
+            if (options.json || options.jsonLegacy)
+                throw error;
+            error.exit();
+        }
         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}`;

package/cli/dist/commands/resources.js

@@ -1,10 +1,11 @@
 import chalk from "chalk";
 import { Command } from "commander";
 import { createDiscoveryContext } from "../utils/discovery-context.js";
-import { requireProjectRoot, runCommand } from "../utils/errors.js";
+import { errorFactories, 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";
+import { stackExists } from "../utils/services.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)
@@ -23,6 +24,12 @@ export const resourcesCommand = new Command("resources")
             requireProjectRoot();
         }
         const discovery = createDiscoveryContext();
+        if (options.stack && !stackExists(options.stack, discovery.resources)) {
+            const error = errorFactories.stackNotFound(options.stack);
+            if (options.json)
+                writeMachineError(error);
+            error.exit();
+        }
         const withoutStackFilter = options.noStack || options.stack === false;
         let resources = discovery.resources;
         if (options.stack) {

package/cli/dist/commands/ui.js

@@ -10,11 +10,21 @@ import { createStatusMessageController } from "../utils/status-message.js";
 import { isTiltAvailable } from "../utils/tilt.js";
 // biome-ignore lint/correctness/noUnusedFunctionParameters: reserved callback prop kept in the component API
 const HelpPanel = ({ onClose }) => (_jsxs(Box, { borderStyle: "single", borderColor: "cyan", paddingX: 2, paddingY: 1, flexDirection: "column", width: 60, children: [_jsx(Text, { bold: true, color: "cyan", children: "Keyboard Shortcuts" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, underline: true, children: "Navigation" }), _jsx(Text, { children: " \u2191/\u2193 Navigate list items" }), _jsx(Text, { children: " Enter Select item / Open detail" }), _jsx(Text, { children: " Space Toggle expand (tree view)" }), _jsx(Text, { children: " Tab Next tab" }), _jsx(Text, { children: " 1-5 Direct tab access" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { bold: true, underline: true, children: "Actions" }) }), _jsx(Text, { children: " m Toggle mouse support" }), _jsx(Text, { children: " t Toggle tooltips" }), _jsx(Text, { children: " e Toggle enabled/disabled services" }), _jsx(Text, { children: " r Refresh data" }), _jsx(Text, { children: " / Search/filter" }), _jsx(Text, { children: " ? Show this help" }), _jsx(Text, { children: " q Quit \u2502 Esc Back" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Press any key to close..." }) })] }));
-const LoadingScreen = ({ progress, message }) => (_jsxs(Box, { flexDirection: "column", padding: 2, children: [_jsx(Text, { bold: true, color: "cyan", children: "\u2593\u2592\u2591 TDK NEON EDITION \u2591\u2592\u2593" }), _jsx(Box, { marginY: 1 }), _jsxs(Text, { children: ["Loading: ", message] }), _jsxs(Box, { marginY: 1, borderStyle: "single", borderColor: "gray", width: 50, children: [_jsx(Box, { width: progress / 2, backgroundColor: "cyan", children: _jsx(Text, { children: " ".repeat(progress / 2) }) }), _jsxs(Text, { children: [" ", progress, "%"] })] })] }));
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+export const LoadingScreen = ({ message = "Discovering resources...", animated = true, }) => {
+    const [frame, setFrame] = useState(0);
+    useEffect(() => {
+        if (!animated)
+            return;
+        const timer = setInterval(() => setFrame((f) => (f + 1) % SPINNER_FRAMES.length), 80);
+        return () => clearInterval(timer);
+    }, [animated]);
+    return (_jsxs(Box, { flexDirection: "column", padding: 2, children: [_jsx(Text, { bold: true, color: "cyan", children: "\u2593\u2592\u2591 TDK NEON EDITION \u2591\u2592\u2593" }), _jsx(Box, { marginY: 1 }), _jsxs(Text, { children: [animated && _jsxs(Text, { color: "cyan", children: [SPINNER_FRAMES[frame], " "] }), message] })] }));
+};
 // biome-ignore lint/correctness/noUnusedFunctionParameters: reserved callback prop kept in the component API
 const ErrorScreen = ({ error, onRetry }) => (_jsxs(Box, { flexDirection: "column", padding: 2, alignItems: "center", children: [_jsx(Text, { bold: true, color: "red", children: "Could Not Load Services" }), _jsx(Box, { marginY: 1 }), _jsxs(Text, { color: "red", children: ["\u2717 ", error] }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: "gray", children: "Troubleshooting:" }), _jsx(Text, { color: "gray", children: " 1. Check that every service.json is valid JSON" }), _jsx(Text, { color: "gray", children: " 2. Run tdk from your project (the folder with the Tiltfile)" }), _jsx(Text, { color: "gray", children: " 3. Try: tdk status --verbose" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: "cyan", children: "Press [r] to retry or [q] to quit" })] }));
 const EmptyState = ({ message }) => (_jsxs(Box, { flexDirection: "column", padding: 2, alignItems: "center", children: [_jsx(Text, { bold: true, color: "yellow", children: "No Services Found" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: "gray", children: "\u25C9 No service.json files found" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { children: "To get started:" }), _jsx(Text, { children: " 1. Run: tdk project" }), _jsx(Text, { children: " 2. Run: tdk resource api --type backend" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: "cyan", children: "Press [r] to refresh or [q] to quit" }), message && (_jsx(Box, { paddingX: 1, height: 1, children: _jsxs(Text, { color: "cyan", children: ["\u2593\u2592\u2591 ", message, " \u2591\u2592\u2593"] }) }))] }));
-const TUIApp = () => {
+const TUIApp = ({ animated = true }) => {
     const { exit } = useApp();
     const { stdout } = useStdout();
     const { stdin, setRawMode } = useStdin();
@@ -401,7 +411,7 @@ const TUIApp = () => {
     const compactTabBar = terminalWidth < 100;
     const compact = terminalWidth < 80;
     if (loading) {
-        return _jsx(LoadingScreen, { progress: 100, message: "Initializing..." });
+        return _jsx(LoadingScreen, { message: "Discovering resources...", animated: animated });
     }
     if (error) {
         return _jsx(ErrorScreen, { error: error, onRetry: refresh });
@@ -431,12 +441,12 @@ export const uiCommand = new Command("ui")
     .option("-v, --verbose", "Enable verbose output", false)
     .option("--no-animations", "Disable animations")
     .option("--high-contrast", "Enable high contrast mode")
-    .action(async () => {
+    .action(async (options) => {
     const tiltAvailable = await isTiltAvailable();
     if (!tiltAvailable) {
         errorFactories.tiltNotInstalled().exit();
     }
     requireProjectRoot();
-    render(_jsx(TUIApp, {}));
+    render(_jsx(TUIApp, { animated: options.animations }));
 });
 //# sourceMappingURL=ui.js.map

package/cli/dist/commands/up.js

@@ -2,7 +2,7 @@ import { connect } from "node:net";
 import { join } from "node:path";
 import chalk from "chalk";
 import { Command } from "commander";
-import { ensureProjectRuntimeAssets } from "../generator/template-engine.js";
+import { ensureProjectRuntimeAssets, ProjectConfigNotFoundError, verifyMasterConfigs, } from "../generator/template-engine.js";
 import { DEVCONTAINER_DOCKER_FIX, detectHost, isContainerHost, WEBCONTAINER_UP_MESSAGE, } from "../utils/agent-host.js";
 import { handleDryRun } from "../utils/command-helpers.js";
 import { getDeferredResourceNames } from "../utils/doctor-runtime.js";
@@ -54,6 +54,48 @@ async function defaultDockerReachable() {
         execFile("docker", ["ps"], { timeout: 10_000 }, (error) => resolve(!error));
     });
 }
+/** Exit status for `tdk up` when generated files no longer match service.json / project.json. */
+export const DRIFT_EXIT_CODE = 2;
+/**
+ * Generated service files edited by hand. Only these block `tdk up`: when service.json itself changed, `tdk up` regenerates
+ * the outputs, so stale outputs are the normal edit-then-up loop and not drift.
+ */
+export function driftReport(projectRoot) {
+    let handEdited;
+    try {
+        ({ handEdited } = verifyMasterConfigs(projectRoot));
+    }
+    catch (error) {
+        // A project with no .tdk/project.json has no snapshots to compare. Anything else (a corrupt config) must not skip the gate.
+        if (error instanceof ProjectConfigNotFoundError)
+            return null;
+        throw error;
+    }
+    if (handEdited.length === 0)
+        return null;
+    return [
+        "Generated files were edited by hand and no longer match service.json:",
+        ...handEdited.map((file) => `  ${file}`),
+        "Run `tdk config regenerate` to discard the edits, or bypass with `tdk up --ignore-drift`.",
+    ];
+}
+/**
+ * Runs before Tilt is started: exits with DRIFT_EXIT_CODE on drift unless `ignoreDrift` is set. With `ignoreDrift` the
+ * warning is printed every time, whether or not anything drifted, because the check is skipped and cannot tell.
+ */
+export function enforceDriftGate(projectRoot, options, exit = process.exit) {
+    if (options.ignoreDrift) {
+        console.warn(chalk.yellow("Warning: --ignore-drift set; generated files were not checked."));
+        return;
+    }
+    const drift = driftReport(projectRoot);
+    if (!drift)
+        return;
+    options.onDrift?.(drift.join("\n"));
+    for (const line of drift)
+        console.error(chalk.red(line));
+    exit(DRIFT_EXIT_CODE);
+}
 function waitForTiltUi(port, timeoutMs = 30_000) {
     return new Promise((resolve) => {
         const deadline = Date.now() + timeoutMs;
@@ -84,6 +126,7 @@ export const upCommand = new Command("up")
     .option("-q, --quiet", "Suppress non-essential output", false)
     .option("--dry-run", "Show what would be started without starting", false)
     .option("-f, --force", "Kill existing Tilt process before starting", false)
+    .option("--ignore-drift", "Start even if generated files differ from service.json", false)
     .option("--only <services...>", "Start only these services plus what the Tiltfile enables for them (their dependsOn services and shared infrastructure). With a stack, names must belong to that stack; dependencies may cross stacks")
     .option("--json", "Print one JSON object on stdout when the stack is ready or the command fails; implies --quiet", false)
     .action(async (stackName, options) => {
@@ -109,9 +152,8 @@ export const upCommand = new Command("up")
         await assertMachineReadyOrExit();
     }
     const action = async () => {
-        const projectRoot = options.dryRun
-            ? requireProjectRoot()
-            : (findProjectRoot() ?? process.cwd());
+        const foundRoot = options.dryRun ? requireProjectRoot() : findProjectRoot();
+        const projectRoot = foundRoot ?? process.cwd();
         const discoveredResources = discoverResourcesStrict();
         // Reject a bad request before anything below can write to the project (.env, runtime assets, .tdk/project.json).
         if (options.only) {
@@ -127,13 +169,20 @@ export const upCommand = new Command("up")
                 showErrorAndExit(message, 2);
             }
         }
+        // Also under --dry-run: the check only reads, and a dry run should show what a real run would refuse.
+        if (foundRoot) {
+            enforceDriftGate(foundRoot, {
+                ignoreDrift: options.ignoreDrift,
+                onDrift: (message) => emit?.({ ok: false }, [{ code: "DRIFT_DETECTED", message }]),
+            });
+        }
         const hostPortPlan = await getHostPortPlan(projectRoot, {
             inspectDocker: !options.dryRun,
         });
         if (!options.dryRun) {
             // An older project's .env predates keys such as JWT_SECRET, which Compose now requires. Add what is missing (never
             // changing an existing value) before anything starts. Only inside a real project, so a stray run never writes a .env.
-            if (findProjectRoot()) {
+            if (foundRoot) {
                 const addedEnvKeys = completeEnvFile(projectRoot);
                 if (addedEnvKeys.length > 0 && !options.quiet) {
                     console.log(chalk.gray(`Added ${addedEnvKeys.join(", ")} to .env (generated; existing values unchanged)`));

package/cli/dist/generator/template-engine.js

@@ -349,10 +349,13 @@ function normalizeProjectConfig(value) {
         overrides: config.overrides,
     };
 }
+/** The project has no .tdk/project.json yet, as opposed to one that exists but is unreadable or invalid. */
+export class ProjectConfigNotFoundError extends Error {
+}
 export function readProjectConfig(projectRoot) {
     const projectJsonPath = path.join(projectRoot, ".tdk", "project.json");
     if (!fs.existsSync(projectJsonPath)) {
-        throw new Error(`Project config not found: ${projectJsonPath}. Run 'tdk project --yes' first.`);
+        throw new ProjectConfigNotFoundError(`Project config not found: ${projectJsonPath}. Run 'tdk project --yes' first.`);
     }
     const jsonContent = fs.readFileSync(projectJsonPath, "utf-8");
     const parsed = JSON.parse(jsonContent);
@@ -604,6 +607,7 @@ export function verifyMasterConfigs(projectRoot) {
     const errors = [];
     const warnings = [];
     const diffs = [];
+    const handEdited = [];
     const addDrift = (displayPath, actual, expected) => {
         if (actual === expected)
             return;
@@ -629,9 +633,11 @@ export function verifyMasterConfigs(projectRoot) {
         const validation = validateServiceManifestFile(manifestPath, displayPath);
         errors.push(...validation.errors);
         warnings.push(...validation.warnings);
-        errors.push(...verifyGeneratedResourceFiles(projectRoot, manifestPath));
+        const generated = verifyGeneratedResourceFiles(projectRoot, manifestPath);
+        errors.push(...generated.errors);
+        handEdited.push(...generated.handEdited);
     }
-    return { valid: errors.length === 0, errors, warnings, diffs };
+    return { valid: errors.length === 0, errors, warnings, diffs, handEdited };
 }
 function createUnifiedDiff(file, actual, expected) {
     const oldLines = actual.replace(/\n$/, "").split("\n");
@@ -651,7 +657,7 @@ function verifyGeneratedResourceFiles(projectRoot, serviceJsonPath) {
     const serviceDir = path.dirname(serviceJsonPath);
     const generatedDir = path.join(serviceDir, ".autogenerated");
     if (!fs.existsSync(generatedDir))
-        return [];
+        return { errors: [], handEdited: [] };
     const generatedFiles = [];
     const collect = (directory, relativeDir = "") => {
         for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
@@ -667,10 +673,11 @@ function verifyGeneratedResourceFiles(projectRoot, serviceJsonPath) {
     };
     collect(generatedDir);
     if (generatedFiles.length === 0)
-        return [];
+        return { errors: [], handEdited: [] };
     const contractDir = path.join(generatedDir, ".tdk-contract");
     const sourceSnapshot = path.join(contractDir, "service.json.source");
     const errors = [];
+    const handEdited = [];
     if (!fs.existsSync(sourceSnapshot)) {
         errors.push(path.relative(projectRoot, sourceSnapshot) +
             ": generated-file contract snapshot is missing (run tdk up to regenerate)");
@@ -691,9 +698,11 @@ function verifyGeneratedResourceFiles(projectRoot, serviceJsonPath) {
             errors.push(`${display}: generated-file snapshot is missing (run tdk up to regenerate)`);
         }
         else if (fs.readFileSync(generated.fullPath, "utf-8") !== fs.readFileSync(snapshotPath, "utf-8")) {
+            // Windows path.relative uses backslashes; report project-relative paths with forward slashes everywhere.
+            handEdited.push(display.split(path.sep).join("/"));
             errors.push(`${display}: generated file differs from its TDK snapshot (run tdk up to regenerate)`);
         }
     }
-    return errors;
+    return { errors, handEdited };
 }
 //# sourceMappingURL=template-engine.js.map

package/cli/dist/utils/services.js

@@ -204,9 +204,9 @@ export function getResourcesForStack(stackName) {
     const allResources = discoverResources();
     return allResources.filter((r) => r.stack === stackName);
 }
-export function stackExists(stackName) {
-    const resources = getResourcesForStack(stackName);
-    return resources.length > 0;
+export function stackExists(stackName, resources) {
+    const resourcesToSearch = resources ?? discoverResources();
+    return resourcesToSearch.some((resource) => resource.stack === stackName);
 }
 /**
  * Cache TTL in milliseconds

package/cli/package.json

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

package/package.json

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