@flisk-sh/flisk 1.3.190 → 1.3.192

package/cli/dist/commands/completion.js

@@ -79,7 +79,7 @@ function shellTypeCondition(types) {
     return parts.join(" || ");
 }
 /** The name of the variable that holds the `--type` of the command line. */
-const TYPE_VARIABLE = "flisk_type";
+const TYPE_VARIABLE = "tdk_type";
 /** The stacks of the current project, read from the machine-readable CLI output. */
 const BASH_STACKS = `flisk stacks --json 2>/dev/null | grep -o '"name":"[^"]*"' | sed 's/"name":"//;s/"$//'`;
 const BASH_RESOURCES = `flisk resources --json 2>/dev/null | grep -o '"name":"[^"]*"' | sed 's/"name":"//;s/"$//'`;
@@ -106,7 +106,7 @@ const ZSH_TYPE = `    local ${TYPE_VARIABLE}=""
         fi
     done`;
 /** The `--type` of the current command line, in fish. */
-const FISH_TYPE = `function __flisk_resource_type
+const FISH_TYPE = `function __tdk_resource_type
     set -l tokens (commandline -opc)
     set -l ${TYPE_VARIABLE} ""
     set -l token_count (count $tokens)
@@ -156,7 +156,7 @@ function zshTypeValues(flag, values) {
 }
 /** The values of a flag that depend on the `--type`, in fish. */
 function fishTypeValues(values) {
-    const lines = ["    switch (__flisk_resource_type)"];
+    const lines = ["    switch (__tdk_resource_type)"];
     for (const arm of typeValueArms(values)) {
         lines.push(`        case ${arm.types.map((type) => (type === "" ? "''" : type)).join(" ")}`);
         lines.push(`            printf '%s\\n' ${arm.values.join(" ")}`);
@@ -252,7 +252,7 @@ function renderBash(candidates) {
         .join("\n");
     return `# Flisk CLI Bash Completion
 # Generated by "flisk completion bash". The command and flag lists come from the CLI itself.
-_flisk_completions() {
+_tdk_completions() {
     local cur prev cmd sub options words commands stacks resources path ${TYPE_VARIABLE} ${TYPE_VARIABLE}_values
     COMPREPLY=()
     cur="\${COMP_WORDS[COMP_CWORD]}"
@@ -335,24 +335,24 @@ ${positionalCases}
     return 0
 }
 
-complete -F _flisk_completions flisk
+complete -F _tdk_completions flisk
 `;
 }
 /** The `_arguments` spec of the positional argument of a command. */
 function zshPositionalSpecs(entry) {
     // A command with sub-commands completes the name of the sub-command, not a value.
     if (entry.subcommands.length > 0) {
-        return [`'1: :_flisk_${entry.name}_subcommands'`];
+        return [`'1: :_tdk_${entry.name}_subcommands'`];
     }
     switch (entry.positional) {
         case "stacks":
-            return ["'1:stack:_flisk_stacks'"];
+            return ["'1:stack:_tdk_stacks'"];
         case "resources":
-            return ["'1:resource:_flisk_resources'"];
+            return ["'1:resource:_tdk_resources'"];
         case "stacks-and-resources":
-            return ["'1:target:_flisk_stacks'"];
+            return ["'1:target:_tdk_stacks'"];
         case "commands":
-            return ["'1:command:_flisk_commands'"];
+            return ["'1:command:_tdk_commands'"];
         default:
             break;
     }
@@ -411,25 +411,25 @@ function renderZsh(candidates) {
         .join("\n");
     const subCommandLists = entries
         .filter((entry) => entry.subcommands.length > 0)
-        .map((entry) => `_flisk_${entry.name}_subcommands() {\n    local commands=(\n${entry.subcommands
+        .map((entry) => `_tdk_${entry.name}_subcommands() {\n    local commands=(\n${entry.subcommands
         .map((subcommand) => `        '${subcommand.name}:${shortDescription(subcommand.description)}'`)
         .join("\n")}\n    )\n    _describe -t commands '${entry.name} command' commands\n}`)
         .join("\n\n");
     const typeValueFunctions = Object.entries(candidates.typeValues)
-        .map(([flag, values]) => `_flisk_${flag.slice(2)}_values() {\n${ZSH_TYPE}\n${zshTypeValues(flag, values)}\n}`)
+        .map(([flag, values]) => `_tdk_${flag.slice(2)}_values() {\n${ZSH_TYPE}\n${zshTypeValues(flag, values)}\n}`)
         .join("\n\n");
     return `#compdef flisk
 
 # Flisk CLI Zsh Completion
 # Generated by "flisk completion zsh". The command and flag lists come from the CLI itself.
 
-_flisk() {
+_tdk() {
     local curcontext="$curcontext" state line
     typeset -A opt_args
 
     _arguments -C \\
         ${globalFlags} \\
-        '1: :_flisk_commands' \\
+        '1: :_tdk_commands' \\
         '*:: :->args'
 
     case "$line[1]" in
@@ -441,20 +441,20 @@ ${subCommandStates}
     esac
 }
 
-_flisk_commands() {
+_tdk_commands() {
     local commands=(
 ${commandList}
     )
     _describe -t commands 'flisk command' commands
 }
 
-_flisk_stacks() {
+_tdk_stacks() {
     local stacks
     stacks=($(flisk stacks --json 2>/dev/null | grep -o '"name":"[^"]*"' | sed 's/"name":"//;s/"$//'))
     _describe -t stacks 'stack' stacks
 }
 
-_flisk_resources() {
+_tdk_resources() {
     local resources
     resources=($(flisk resources --json 2>/dev/null | grep -o '"name":"[^"]*"' | sed 's/"name":"//;s/"$//'))
     _describe -t resources 'resource' resources
@@ -463,24 +463,24 @@ _flisk_resources() {
 ${subCommandLists}
 
 ${typeValueFunctions}
-compdef _flisk flisk
+compdef _tdk flisk
 `;
 }
 /** The `_arguments` spec of one flag, with the values it completes when it has them. */
 function zshOptionSpec(option, candidates, entry) {
     const description = shortDescription(option.description);
     if (candidates.typeValues[option.flag]) {
-        return `'${option.flag}[${description}]:${option.flag.slice(2)}:_flisk_${option.flag.slice(2)}_values'`;
+        return `'${option.flag}[${description}]:${option.flag.slice(2)}:_tdk_${option.flag.slice(2)}_values'`;
     }
     const values = valuesOf(option.flag, candidates, entry);
     if (values) {
         return `'${option.flag}[${description}]:${option.flag.slice(2)}:(${values.join(" ")})'`;
     }
     if (option.flag === "--stack") {
-        return `'${option.flag}[${description}]:stack:_flisk_stacks'`;
+        return `'${option.flag}[${description}]:stack:_tdk_stacks'`;
     }
     if (option.flag === "--only") {
-        return `'${option.flag}[${description}]:service:_flisk_resources'`;
+        return `'${option.flag}[${description}]:service:_tdk_resources'`;
     }
     return option.takesValue
         ? `'${option.flag}[${description}]:${option.flag.slice(2)}:'`
@@ -526,7 +526,7 @@ function renderFish(candidates) {
         .filter((entry) => entry.positional === "commands")
         .map((entry) => `complete -c flisk -f -n '${fishCondition(entry)}' -a '${commandWords(entries).join(" ")}'`);
     const typeValueFunctions = Object.entries(candidates.typeValues)
-        .map(([flag, values]) => `function __flisk_${flag.slice(2)}_values\n${fishTypeValues(values)}\nend`)
+        .map(([flag, values]) => `function __tdk_${flag.slice(2)}_values\n${fishTypeValues(values)}\nend`)
         .join("\n\n");
     return `# Flisk CLI Fish Completion
 # Generated by "flisk completion fish". The command and flag lists come from the CLI itself.
@@ -571,7 +571,7 @@ function fishCondition(entry) {
 /** The fish argument that lists the values of a flag. */
 function fishValueArgument(option, candidates, entry) {
     if (candidates.typeValues[option.flag]) {
-        return ` -r -a '(__flisk_${option.flag.slice(2)}_values)'`;
+        return ` -r -a '(__tdk_${option.flag.slice(2)}_values)'`;
     }
     const values = valuesOf(option.flag, candidates, entry);
     return values ? ` -r -a '${values.join(" ")}'` : "";
@@ -761,11 +761,11 @@ export const completionCommand = new Command("completion")
     const candidates = buildCompletionCandidates(program);
     const completionScript = renderCompletionScript(shell, candidates);
     const filename = shell === "bash"
-        ? "flisk-completion.bash"
+        ? "tdk-completion.bash"
         : shell === "zsh"
-            ? "_flisk"
+            ? "_tdk"
             : shell === "fish"
-                ? "flisk.fish"
+                ? "tdk.fish"
                 : "Microsoft.PowerShell_profile.ps1";
     if (options.install) {
         const home = homedir();

package/cli/dist/commands/config.js

@@ -325,7 +325,7 @@ async function toggleInfraService(service, enabled) {
         const granted = await hasVerdaccioLicense(projectRoot);
         if (!granted) {
             throw new Error("Verdaccio is a Premium feature and requires a license key that grants it. " +
-                "Set export TDK_LICENSE_KEY=<key> (request a Premium license at https://tdk-landscape.github.io/tdk-website/#waitlist) and try again.");
+                "Set export TDK_LICENSE_KEY=<key> (request a Premium license at https://flisk.sh/#waitlist) and try again.");
         }
     }
     const config = readProjectConfig(projectRoot);

package/cli/dist/commands/import.js

@@ -9,7 +9,7 @@ import { getPackageVersion } from "../utils/paths.js";
  * pinned version so a push to its main branch cannot change what `flisk import` does. Move the pin
  * when a new importer is published. `TDK_IMPORT_PACKAGE` overrides the package spec.
  */
-export const IMPORT_PACKAGE = "@tdk-landscape/tdk-import@0.2.1";
+export const IMPORT_PACKAGE = "flisk-import@0.2.2";
 /** Minimum Flisk core release supporting buildContext required by flisk import (#634). */
 export const MIN_CORE_VERSION = "1.3.104";
 /** Recommended core version with automatic Tiltfile bootstrapping for imported stacks (#1018). */
@@ -109,7 +109,7 @@ export function importInvocation(args, env = process.env, platform = process.pla
         shell: platform === "win32",
     };
 }
-/** Runs tdk-import with the caller's terminal and resolves to its exit code. */
+/** Runs flisk-import with the caller's terminal and resolves to its exit code. */
 export function runImport(args, spawnFn = spawn, getVersionFn = getPackageVersion) {
     const check = checkCoreVersion(getVersionFn(), args);
     if (!check.ok) {
@@ -153,8 +153,8 @@ export function buildForwardedImportArgs(args, options = {}) {
     return filtered;
 }
 export const importCommand = addYesOption(new Command("import"))
-    .description("Import the services in a directory's root docker-compose.yml (runs tdk-import)")
-    .argument("[args...]", "Passed to tdk-import: [dir] --dry-run --yes --force")
+    .description("Import the services in a directory's root docker-compose.yml (runs flisk-import)")
+    .argument("[args...]", "Passed to flisk-import: [dir] --dry-run --yes --force")
     .option("-f, --force", "Overwrite an existing service.json", false)
     .allowUnknownOption()
     .helpOption(false)

package/cli/dist/commands/maintainers.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 export const MIN_MAINTAINERS = 3;
 export const MIN_COMPANIES = 2;
 const REQUIRED_COLUMNS = ["name", "github id", "company"];
-const PLACEHOLDER_COMPANIES = new Set(["", "tbd", "unknown", "tdk-landscape"]);
+const PLACEHOLDER_COMPANIES = new Set(["", "tbd", "unknown", "flisk-sh"]);
 function splitRow(line) {
     return line
         .trim()

package/cli/dist/commands/mcp.js

@@ -8,10 +8,7 @@ import { getPackageVersion } from "../utils/paths.js";
 export const mcpCommand = new Command("mcp")
     .description("Run a Model Context Protocol server over stdio for coding agents")
     .action(async () => {
-    const server = createMcpServer(createTdkTools(), {
-        name: "flisk",
-        version: getPackageVersion(),
-    });
+    const server = createMcpServer(createTdkTools(), { name: "flisk", version: getPackageVersion() });
     // Stdout is the protocol channel. Nothing else may write to it; diagnostics go to stderr.
     const lines = createInterface({ input: process.stdin });
     const pending = new Set();

package/cli/dist/commands/project.js

@@ -78,7 +78,15 @@ function getDefaultCoreServices() {
         .filter((f) => f.enabled_by_default && f.category === "core")
         .map((f) => f.name);
 }
-async function cloneProjectTemplate(templateName, targetDir, runtimeNextSteps) {
+/** The directory a template lands in: the requested path, or the template's repository name. */
+export function templateTargetDir(templateName, targetDir) {
+    if (targetDir)
+        return targetDir;
+    const template = PROJECT_TEMPLATES[templateName];
+    const fromRepo = template?.repo.split("/").pop() ?? templateName;
+    return fromRepo.replace(/\.git$/, "");
+}
+export async function cloneProjectTemplate(templateName, targetDir, runtimeNextSteps) {
     const template = PROJECT_TEMPLATES[templateName];
     if (!template) {
         console.log(chalk.red(`\n❌ Unknown template: "${templateName}"`));
@@ -89,7 +97,7 @@ async function cloneProjectTemplate(templateName, targetDir, runtimeNextSteps) {
         console.log(chalk.gray("\nOr run `flisk project` with no template for a blank project."));
         process.exit(1);
     }
-    const dirName = targetDir || (template.repo.split("/").pop() ?? templateName).replace(/\.git$/, "");
+    const dirName = templateTargetDir(templateName, targetDir);
     if (!isPathSafe(dirName)) {
         errorFactories.invalidPath(dirName).exit();
     }

package/cli/dist/commands/resource.js

@@ -499,7 +499,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
                 const granted = await hasDddLicense(projectRoot);
                 if (!granted) {
                     throw new Error("DDD scaffolding is a Premium feature and requires a license key that grants it. " +
-                        "Set export TDK_LICENSE_KEY=<key> (request a Premium license at https://tdk-landscape.github.io/tdk-website/#waitlist) and try again.");
+                        "Set export TDK_LICENSE_KEY=<key> (request a Premium license at https://flisk.sh/#waitlist) and try again.");
                 }
                 dddEnabled = true;
             }

package/cli/dist/commands/ui.js

@@ -45,7 +45,7 @@ export const LoadingScreen = ({ message = "Discovering resources...", animated =
 // biome-ignore lint/correctness/noUnusedFunctionParameters: reserved callback prop kept in the component API
 const ErrorScreen = ({ error, onRetry }) => {
     const theme = useTUITheme();
-    return (_jsxs(Box, { flexDirection: "column", padding: 2, alignItems: "center", children: [_jsx(Text, { bold: true, color: theme.error, children: "Could Not Load Services" }), _jsx(Box, { marginY: 1 }), _jsxs(Text, { color: theme.error, children: [theme.ascii ? "[x]" : "\u2717", " ", error] }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: theme.muted, children: "Troubleshooting:" }), _jsx(Text, { color: theme.muted, children: " 1. Check that every service.json is valid JSON" }), _jsxs(Text, { color: theme.muted, children: [" ", "2. Run flisk from your project (the folder with the Tiltfile)"] }), _jsx(Text, { color: theme.muted, children: " 3. Try: flisk status --verbose" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: theme.accent, children: "Press [r] to retry or [q] to quit" })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 2, alignItems: "center", children: [_jsx(Text, { bold: true, color: theme.error, children: "Could Not Load Services" }), _jsx(Box, { marginY: 1 }), _jsxs(Text, { color: theme.error, children: [theme.ascii ? "[x]" : "\u2717", " ", error] }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: theme.muted, children: "Troubleshooting:" }), _jsx(Text, { color: theme.muted, children: " 1. Check that every service.json is valid JSON" }), _jsx(Text, { color: theme.muted, children: " 2. Run flisk from your project (the folder with the Tiltfile)" }), _jsx(Text, { color: theme.muted, children: " 3. Try: flisk status --verbose" }), _jsx(Box, { marginY: 1 }), _jsx(Text, { color: theme.accent, children: "Press [r] to retry or [q] to quit" })] }));
 };
 const EmptyState = ({ message }) => {
     const theme = useTUITheme();

package/cli/dist/commands/up.js

@@ -10,8 +10,9 @@ import { DEVCONTAINER_DOCKER_FIX, detectHost, isContainerHost, WEBCONTAINER_UP_M
 import { handleDryRun } from "../utils/command-helpers.js";
 import { STANDARD_PORTS } from "../utils/constants.js";
 import { getDeferredResourceNames, summarizeTiltBuildError } from "../utils/doctor-runtime.js";
+import { applyEnvFileSelection, assertEngineSupportsEnvFile, EnvFileError, envFileWarning, PROJECT_ENV_FILE_VAR, selectEnvFile, } from "../utils/env-selection.js";
 import { completeEnvFile } from "../utils/env-validator.js";
-import { errorFactories, handleTiltFailure, requireProjectRoot, runCommand, showError, showErrorAndExit, withTiltCheck, } from "../utils/errors.js";
+import { errorFactories, getErrorMessage, handleTiltFailure, requireProjectRoot, runCommand, showError, showErrorAndExit, TdkError, withTiltCheck, } from "../utils/errors.js";
 import { ensureSmokeRecordsIgnored } from "../utils/file-helpers.js";
 import { formatCount } from "../utils/formatting.js";
 import { exportHostPortPlan, getHostPortPlan, writeSavedHostPortPlan, } from "../utils/host-port-config.js";
@@ -162,6 +163,37 @@ function waitForTiltUi(port, timeoutMs = 30_000) {
         attempt();
     });
 }
+/**
+ * The env file of the run. `flisk up --env-file <path>` replaces the project `.env` for the run, so the
+ * file is resolved, read and checked before anything is written or started. Without the option the
+ * project `.env` stays the env file of the run, exactly as before.
+ *
+ * @throws TdkError when the file cannot be used; the run stops before it starts
+ */
+export function selectRunEnvFile(projectRoot, requested) {
+    if (requested === undefined)
+        return undefined;
+    if (!projectRoot) {
+        throw errorFactories.notInProject();
+    }
+    const selection = selectEnvFile(projectRoot, requested);
+    // A project created before this option vendored an engine that ignores the selection, so the run
+    // would silently use the project .env instead.
+    assertEngineSupportsEnvFile(projectRoot);
+    return selection;
+}
+/** The machine-readable failure of a refused `--env-file`, and the exit code it stops the run with. */
+function envFileFailure(error) {
+    const suggestions = error instanceof TdkError ? error.suggestions : [];
+    return {
+        failure: {
+            code: error instanceof EnvFileError ? error.code : "ENV_FILE_INVALID",
+            message: getErrorMessage(error),
+            ...(suggestions.length > 0 ? { suggestions } : {}),
+        },
+        exitCode: error instanceof TdkError ? error.exitCode : 2,
+    };
+}
 export const upCommand = new Command("up")
     .description("Start all services (optionally filtered by stack)")
     .alias("deploy")
@@ -173,6 +205,7 @@ export const upCommand = new Command("up")
     .option("--ignore-drift", "Start even if generated files differ from service.json", false)
     .option("--ignore-version", "Start even if this flisk is older than minTdkVersion in .tdk/project.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("--env-file <path>", "Use this project env file for the run instead of .env (for example: --env-file .env.integration)")
     .option("--json", "Print one JSON object on stdout when the stack is ready or the command fails; implies --quiet", false)
     .action(async (stackName, options) => {
     const emit = options.json ? createJsonEmitter("UP_FAILED", "flisk up") : undefined;
@@ -192,6 +225,35 @@ export const upCommand = new Command("up")
             onFail: (message) => emit?.({ ok: false }, [{ code: "TDK_VERSION_TOO_OLD", message }]),
         });
     }
+    // The env file of the run. `--env-file` replaces the project .env for this run, so the file is
+    // resolved and read before any prerequisite check, any write and any service starts.
+    const envFileRoot = versionRoot;
+    let envFileSelection;
+    if (options.envFile === undefined) {
+        // Without the option the project .env is the env file of the run, whatever the environment
+        // carries: an inherited TDK_ENV_FILE must not change the default.
+        delete process.env[PROJECT_ENV_FILE_VAR];
+    }
+    if (options.envFile !== undefined) {
+        try {
+            envFileSelection = selectRunEnvFile(envFileRoot, options.envFile);
+        }
+        catch (error) {
+            const { failure, exitCode } = envFileFailure(error);
+            emit?.({ ok: false }, [failure]);
+            showErrorAndExit(failure.message, exitCode, failure.suggestions);
+        }
+        if (envFileSelection && envFileRoot) {
+            applyEnvFileSelection(envFileSelection);
+            if (!options.quiet) {
+                console.log(chalk.gray(`Using env file: ${envFileSelection.relativePath} (the project .env is not read in this run)`));
+            }
+            const warning = envFileWarning(envFileRoot, envFileSelection);
+            // stderr, not stdout: in --json mode stdout carries the JSON envelope only.
+            if (warning)
+                console.warn(chalk.yellow(warning));
+        }
+    }
     const hostRefusal = options.dryRun ? null : await hostUpRefusal();
     if (hostRefusal) {
         emit?.({ ok: false }, [{ code: "HOST_UNSUPPORTED", message: hostRefusal }]);
@@ -281,7 +343,8 @@ export const upCommand = new Command("up")
         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 (foundRoot) {
+            // A selected env file replaces the project .env for this run: the run does not read it, so it is not completed either.
+            if (foundRoot && !envFileSelection) {
                 const addedEnvKeys = completeEnvFile(projectRoot);
                 if (addedEnvKeys.length > 0 && !options.quiet) {
                     console.log(chalk.gray(`Added ${addedEnvKeys.join(", ")} to .env (generated; existing values unchanged)`));
@@ -418,6 +481,14 @@ export const upCommand = new Command("up")
             only: Boolean(options.only),
         });
         if (decision.action === "already-running") {
+            // The env file of the run belongs to the Tilt process this run starts. A stack that is
+            // already running keeps the env file it started with, so the selection would be ignored
+            // silently - say so instead of reporting a run that never happened.
+            if (envFileSelection) {
+                const message = `A Tilt is already running on port ${decision.ports.join(", ")}. --env-file applies to a new run only: run \`flisk down\` first, or pass --force to replace the running stack.`;
+                emit?.({ ok: false }, [{ code: "ENV_FILE_ALREADY_RUNNING", message }]);
+                showErrorAndExit(message);
+            }
             const message = `Environment is already running on port ${decision.ports.join(", ")}.`;
             emit?.({
                 ok: true,
@@ -553,7 +624,10 @@ export const upCommand = new Command("up")
                     console.warn(chalk.yellow(ignoreWarning));
                 const results = await runSmokePlans(smokePlans, {
                     recordDir: join(projectRoot, ".tdk", "smoke"),
-                    ...safeSmokeDeps(projectRoot, (message) => console.warn(chalk.yellow(message))),
+                    ...safeSmokeDeps(projectRoot, (message) => console.warn(chalk.yellow(message)), {
+                        // The selected env file holds secrets as much as the project .env.
+                        envFiles: envFileSelection ? [envFileSelection.path] : [],
+                    }),
                 });
                 for (const smokeResult of results) {
                     if (smokeResult.ok) {

package/cli/dist/commands/upgrade.js

@@ -12,7 +12,7 @@ import { PACKAGE_JSON } from "../utils/constants.js";
 import { getErrorMessage, logVerbose, showErrorAndExit } from "../utils/errors.js";
 import { showCancelled } from "../utils/formatting.js";
 import { getPackageVersion } from "../utils/paths.js";
-import { binaryAssetName, executableName, isWindows, legacyExecutableName, } from "../utils/platform.js";
+import { binaryAssetName, executableName, isWindows } from "../utils/platform.js";
 import { promptConfirm } from "../utils/prompt.js";
 import { startSpinner } from "../utils/spinner.js";
 import { extractTarball } from "../utils/tar.js";
@@ -33,11 +33,7 @@ export function isStandaloneBinary(tdkPath) {
 /** @internal Exported for unit tests only; not part of the package API. */
 export function classifyRunningInstall(execPath, scriptPath, platformName = process.platform) {
     const runningName = (platformName === "win32" ? win32.basename(execPath) : basename(execPath)).toLowerCase();
-    const isFliskBinary = runningName === "flisk" ||
-        runningName === "flisk.exe" ||
-        runningName === "tdk" ||
-        runningName === "tdk.exe";
-    if (isFliskBinary) {
+    if (runningName === "flisk" || runningName === "tdk.exe") {
         return { method: "binary", path: execPath };
     }
     if (runningName === "node" || runningName === "node.exe") {
@@ -61,7 +57,7 @@ export function detectInstallation() {
     if (runningInstall)
         return runningInstall;
     try {
-        const tdkPath = findOnPath(executableName()) ?? findOnPath(legacyExecutableName());
+        const tdkPath = findOnPath(executableName());
         if (!tdkPath)
             return { method: "unknown" };
         // `readlink -f` is not available on macOS. Use Node's cross-platform
@@ -84,7 +80,7 @@ export function detectInstallation() {
         if (existsSync(join(cliRoot, ".git"))) {
             return { method: "git", path: cliRoot };
         }
-        // Standalone prebuilt binary from tdk-cli-releases (installed to e.g. /usr/local/bin),
+        // Standalone prebuilt binary from flisk-sh/releases (installed to e.g. /usr/local/bin),
         // not a node_modules/.bun link and not sitting inside a git checkout.
         if (isStandaloneBinary(realPath)) {
             return { method: "binary", path: realPath };
@@ -138,8 +134,8 @@ export function detectAllInstallations() {
     }
     return [...unique.values()];
 }
-const BINARY_RELEASE_REPO = "flisk-sh/tdk-cli-releases";
-const ENGINE_ASSET_NAME = "flisk-cli-engine.tar.gz";
+const BINARY_RELEASE_REPO = "flisk-sh/releases";
+const ENGINE_ASSET_NAME = "tdk-cli-engine.tar.gz";
 const CHECKSUMS_ASSET_NAME = "checksums.txt";
 /** Parses `shasum -a 256` / `sha256sum` output ("<hash>  <name>" or "<hash> *<name>"). */
 /** @internal Exported for unit tests only; not part of the package API. */
@@ -361,10 +357,27 @@ export async function getLatestVersion() {
         return null;
     }
 }
+/**
+ * Removes the package the CLI shipped under before the rename. It owns the old `flisk` command,
+ * so npm and bun refuse to install @flisk-sh/flisk next to it (EEXIST) and the upgrade dies
+ * before it starts. The removal is best effort: the package is often not installed at all.
+ */
+function removeLegacyInstallation(manager) {
+    const command = manager === "npm"
+        ? "npm uninstall -g @tdk-landscape/tdk-cli-core"
+        : "bun remove -g @tdk-landscape/tdk-cli-core";
+    try {
+        execSync(command, { stdio: ["ignore", "ignore", "ignore"], timeout: 60000 });
+    }
+    catch {
+        // Not installed under the old name, or the manager is missing. Nothing to remove.
+    }
+}
 /** @internal Exported for unit tests only; not part of the package API. */
 export async function upgradeViaNpm() {
     const spinner = startSpinner("Upgrading via npm...");
     try {
+        removeLegacyInstallation("npm");
         execSync("npm install -g @flisk-sh/flisk@latest", {
             stdio: ["inherit", "inherit", "pipe"],
             timeout: 120000,
@@ -389,8 +402,8 @@ export async function upgradeViaNpm() {
             console.log(chalk.gray("\nFor EACCES or EPERM, fix npm's global prefix or use the binary installer:"));
             console.log(chalk.cyan("   https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally/"));
             console.log(chalk.cyan(isWindows()
-                ? "   irm https://tdk-landscape.github.io/install.ps1 | iex"
-                : "   curl -fsSL https://tdk-landscape.github.io/install.sh | sh"));
+                ? "   irm https://flisk.sh/install.ps1 | iex"
+                : "   curl -fsSL https://flisk.sh/install.sh | sh"));
         }
         return false;
     }
@@ -399,6 +412,7 @@ export async function upgradeViaNpm() {
 export async function upgradeViaBun() {
     const spinner = startSpinner("Upgrading via bun...");
     try {
+        removeLegacyInstallation("bun");
         execFileSync(findOnPath("bun") ?? "bun", ["install", "-g", "@flisk-sh/flisk@latest"], {
             stdio: "inherit",
             timeout: 120000,
@@ -639,7 +653,7 @@ export function createUpgradeCommand() {
                     showErrorAndExit("Flisk Windows v1 supports AMD64 only. Use WSL2 Ubuntu or a 64-bit Intel/AMD PC.");
                 }
                 if (process.platform === "win32") {
-                    showErrorAndExit("No Windows AMD64 binary in this Flisk release. Need asset flisk-windows-amd64.exe.");
+                    showErrorAndExit("No Windows AMD64 binary in this Flisk release. Need asset tdk-windows-amd64.exe.");
                 }
                 showErrorAndExit(`Unsupported OS: Flisk does not support this OS: ${process.platform}. Supported: linux, darwin, win32.`);
             }
@@ -771,7 +785,7 @@ export function createUpgradeCommand() {
             else if (installInfo.method === "binary" && binaryRelease && installInfo.path) {
                 const engineDir = join(dirname(installInfo.path), "tdk-cli");
                 if (isWindows()) {
-                    console.log(chalk.cyan("   irm https://tdk-landscape.github.io/install.ps1 | iex"));
+                    console.log(chalk.cyan("   irm https://flisk.sh/install.ps1 | iex"));
                 }
                 else {
                     console.log(chalk.cyan(`   curl -fsSL -o ${installInfo.path} ${binaryRelease.downloadUrl}`));

package/cli/dist/generator/extension-fetch.js

@@ -17,14 +17,14 @@
 // template-engine.ts - Verdaccio and Sablier's real gate is the file
 // overlay above (their public files are disabled stubs, not gated code).
 //
-// The worker (tdk-extension-dist) is the real access-control boundary: it
+// The worker (flisk-extension-dist) is the real access-control boundary: it
 // checks the key against BUNDLES_REPO/keys/*.json - existence, activation/
 // expiry dates, granted resources, and a per-key project limit - before
 // serving anything. This client just asks and, if granted, unpacks the
 // result over the vendored stub files so the generator pipeline picks up
 // the real implementations transparently. See
-// tdk-extension-dist/src/index.ts for the server-side enforcement and
-// tdk-extension-dist/src/project-limit.ts for the project-limit logic.
+// flisk-extension-dist/src/index.ts for the server-side enforcement and
+// flisk-extension-dist/src/project-limit.ts for the project-limit logic.
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";

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

@@ -23,12 +23,12 @@ export function loadTemplate(filename) {
         path.join(__dirname, "..", "..", "templates"), // Standard: dist/generator -> templates (also covers src/generator -> ../../templates in dev/test)
         path.join(__dirname, "..", "templates"), // Installed: dist/generator -> dist/templates
         path.join(__dirname, "..", "..", "..", "templates"), // Development: cli/dist/generator -> cli/templates
-        path.join(process.cwd(), "node_modules", "flisk", "templates"), // Monorepo root
+        path.join(process.cwd(), "node_modules", "@flisk-sh", "flisk", "templates"), // Monorepo root
         // Compiled single-file binary (bun build --compile): __dirname resolves inside the
         // virtual $bunfs filesystem, not a real path, so fall back to the directory the actual
-        // executable lives in. release-binaries.sh bundles cli/templates at flisk/cli/templates
+        // executable lives in. release-binaries.sh bundles cli/templates at tdk-cli/cli/templates
         // next to the platform binaries.
-        path.join(path.dirname(process.execPath), "flisk", "cli", "templates"),
+        path.join(path.dirname(process.execPath), "tdk-cli", "cli", "templates"),
     ];
     const triedPaths = [];
     for (const templateDir of templateDirs) {
@@ -587,8 +587,8 @@ export function findCliAssetRoot() {
     }
     const exeDir = path.dirname(process.execPath);
     const candidates = [
-        path.join(exeDir, "flisk"),
-        path.join(process.cwd(), "node_modules", "flisk"),
+        path.join(exeDir, "tdk-cli"),
+        path.join(process.cwd(), "node_modules", "@flisk-sh", "flisk"),
     ];
     return (candidates.find((candidate) => fs.existsSync(path.join(candidate, "shared-platform-engineering", "docker-templates"))) ?? null);
 }
@@ -624,7 +624,7 @@ async function vendorTdkExtension(projectRoot) {
     //   1. $TDK_EXTENSION_SOURCE (explicit override)
     //   2. Self-contained repo (engine/ ships next to cli/ - public flisk)
     //   3. Executable-adjacent checkout (bundled installs)
-    //   4. Relative ../flisk sibling (monorepo maintainer layout)
+    //   4. Relative ../tdk-cli sibling (monorepo maintainer layout)
     const sources = [];
     if (process.env.TDK_EXTENSION_SOURCE) {
         sources.push(process.env.TDK_EXTENSION_SOURCE);
@@ -641,8 +641,8 @@ async function vendorTdkExtension(projectRoot) {
     // Bun's process object - it was always undefined, silently falling
     // back to cwd() instead of the binary's real location.
     const exeDir = path.dirname(process.execPath);
-    sources.push(path.join(exeDir, "flisk"));
-    sources.push(path.join(projectRoot, "..", "flisk"));
+    sources.push(path.join(exeDir, "tdk-cli"));
+    sources.push(path.join(projectRoot, "..", "tdk-cli"));
     let sourceRoot = "";
     for (const candidate of sources) {
         if (candidate &&

package/cli/dist/mcp/tools.js

@@ -79,10 +79,7 @@ export function toToolResult(run) {
         return {
             data: {
                 errors: [
-                    {
-                        code: "NO_JSON",
-                        message: run.stderr.trim() || `flisk exited with code ${run.exitCode}`,
-                    },
+                    { code: "NO_JSON", message: run.stderr.trim() || `flisk exited with code ${run.exitCode}` },
                 ],
             },
             isError: true,
@@ -123,7 +120,7 @@ export const defaultUpDeps = {
     },
     sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
     now: () => Date.now(),
-    logFile: () => join(tmpdir(), `flisk-mcp-up-${Date.now()}.log`),
+    logFile: () => join(tmpdir(), `tdk-mcp-up-${Date.now()}.log`),
 };
 export function buildUpArgs(args) {
     const stack = optionalName(args.stack, "stack");

package/cli/dist/program.js

@@ -20,6 +20,8 @@ export function createProgram() {
         .description("Flisk CLI — start services on your machine.")
         .version(pkg.version, "-v, --version", "Display version number")
         .option("--verbose", "Enable verbose output", false)
+        .option("--template <name>", "Create a project from a starter template in one command (restaurant, saas, erp, ecommerce, example)")
+        .option("--project <dir>", "Directory to create the project in (default: the template name)")
         .configureOutput({
         outputError: (str, write) => write(chalk.red(str)),
         writeOut: (str) => process.stdout.write(str),