@flisk-sh/flisk 1.3.207 → 1.4.0

package/cli/dist/commands/project.js

@@ -60,7 +60,7 @@ function syncDiscoveredStacksToPreAlpha(projectConfig, discoveredStacks) {
  * `flisk up` without re-running `flisk project`. Returns the stacks it enabled.
  */
 export function enableDiscoveredStacks(projectRoot, resources) {
-    const projectJsonPath = join(projectRoot, ".tdk", PROJECT_JSON);
+    const projectJsonPath = join(projectRoot, ".flisk", PROJECT_JSON);
     if (!existsSync(projectJsonPath))
         return [];
     const projectConfig = readProjectConfig(projectRoot);
@@ -135,7 +135,7 @@ export async function cloneProjectTemplate(templateName, targetDir, runtimeNextS
             ]) {
                 const copiedPath = join(destination, file);
                 const contents = readFileSync(copiedPath, "utf-8");
-                writeFileSync(copiedPath, contents.replaceAll("tdk_example", projectSlug));
+                writeFileSync(copiedPath, contents.replaceAll("flisk_example", projectSlug));
             }
         }
         else {
@@ -241,10 +241,10 @@ export const projectCommand = addYesOption(new Command("project"))
                 showDetail(`Location: ${projectRoot}\n`, 0);
             }
         }
-        const tdkDir = join(projectRoot, ".tdk");
-        const projectJsonPath = join(tdkDir, PROJECT_JSON);
+        const fliskDir = join(projectRoot, ".flisk");
+        const projectJsonPath = join(fliskDir, PROJECT_JSON);
         if (options.check) {
-            const allFilesExist = MASTER_CONFIG_FILES.every((f) => existsSync(join(projectRoot, ".tdk", ".tdk-out", f)));
+            const allFilesExist = MASTER_CONFIG_FILES.every((f) => existsSync(join(projectRoot, ".flisk", ".flisk-out", f)));
             const projectJsonExists = existsSync(projectJsonPath);
             if (allFilesExist && projectJsonExists) {
                 const projectConfig = readProjectConfig(projectRoot);
@@ -256,10 +256,10 @@ export const projectCommand = addYesOption(new Command("project"))
             else {
                 console.log(chalk.yellow("⚠️  Project configuration incomplete:"));
                 if (!projectJsonExists)
-                    showDetail(".tdk/project.json (not found)", 3);
+                    showDetail(".flisk/project.json (not found)", 3);
                 if (!allFilesExist) {
-                    for (const f of MASTER_CONFIG_FILES.filter((f) => !existsSync(join(projectRoot, ".tdk/.tdk-out", f)))) {
-                        showDetail(`.tdk/.tdk-out/${f} (not found)`, 3);
+                    for (const f of MASTER_CONFIG_FILES.filter((f) => !existsSync(join(projectRoot, ".flisk/.flisk-out", f)))) {
+                        showDetail(`.flisk/.flisk-out/${f} (not found)`, 3);
                     }
                 }
                 showDetail("Run `flisk project` to create them.");
@@ -270,15 +270,15 @@ export const projectCommand = addYesOption(new Command("project"))
             showCommandHeader("Project Configuration");
             showDetail(`Project root: ${projectRoot}\n`, 0);
         }
-        if (!existsSync(tdkDir)) {
-            ensureDirectory(tdkDir);
+        if (!existsSync(fliskDir)) {
+            ensureDirectory(fliskDir);
             if (!quiet)
-                showSuccess("Created: .tdk/ directory");
+                showSuccess("Created: .flisk/ directory");
         }
         const projectJsonExists = existsSync(projectJsonPath);
         if (projectJsonExists && !options.force) {
             if (!quiet)
-                showSuccess(".tdk/project.json exists");
+                showSuccess(".flisk/project.json exists");
             const rawProjectConfig = JSON.parse(readFileSync(projectJsonPath, "utf-8"));
             const projectConfig = readProjectConfig(projectRoot);
             const discoveredStacks = discoverExistingServiceStacks(projectRoot);
@@ -309,7 +309,7 @@ export const projectCommand = addYesOption(new Command("project"))
             }
             if (!quiet) {
                 console.log(chalk.green("\n✅ Project configuration regenerated!"));
-                showDetail("\nGenerated in .tdk/.tdk-out/:", 0);
+                showDetail("\nGenerated in .flisk/.flisk-out/:", 0);
                 for (const file of MASTER_CONFIG_FILES) {
                     showDetail(`- ${file}`);
                 }
@@ -320,7 +320,7 @@ export const projectCommand = addYesOption(new Command("project"))
             return;
         }
         if (projectJsonExists && options.force && !options.yes) {
-            console.log(chalk.red("\n⚠️  WARNING: --force will overwrite .tdk/project.json!"));
+            console.log(chalk.red("\n⚠️  WARNING: --force will overwrite .flisk/project.json!"));
             const confirm = await promptConfirm({
                 message: "This will reset your project configuration. Continue?",
                 initial: false,
@@ -411,7 +411,7 @@ export const projectCommand = addYesOption(new Command("project"))
             showStep("\n📂 Service discovery");
             showDetail("What: folder patterns Flisk scans for a service.json in each match.");
             showDetail("Where: type one or more globs, comma-separated.");
-            showDetail("How: saved as discovery.paths in .tdk/project.json - editable later.");
+            showDetail("How: saved as discovery.paths in .flisk/project.json - editable later.");
             showDetail(`Example: ${DEFAULT_PROJECT_JSON.discovery.paths.join(", ")}\n`);
             const discoveryPaths = await promptText({
                 message: "Folders to scan:",
@@ -445,7 +445,7 @@ export const projectCommand = addYesOption(new Command("project"))
             showStep("\n📋 Creating project configuration...\n");
         writeJsonFile(projectJsonPath, projectConfig);
         if (!quiet) {
-            showSuccess("Created: .tdk/project.json");
+            showSuccess("Created: .flisk/project.json");
             showDetail(`→ Project: ${projectConfig.project.name}`);
             showStep("\n📋 Generating master configuration files...\n");
         }
@@ -483,21 +483,21 @@ export const projectCommand = addYesOption(new Command("project"))
         }
         if (!quiet) {
             console.log(chalk.green("\n✅ Project configuration complete!"));
-            showDetail("\nGenerated files in .tdk/.tdk-out/:", 0);
+            showDetail("\nGenerated files in .flisk/.flisk-out/:", 0);
             for (const file of MASTER_CONFIG_FILES) {
                 showDetail(`- ${file}`);
             }
             showDetail("\nEnvironment configuration:", 0);
             showDetail("- .env (contains all required variables)");
             showDetail("\nSource file:", 0);
-            showDetail("- .tdk/project.json (edit this to change project structure)");
+            showDetail("- .flisk/project.json (edit this to change project structure)");
             showDetail("\nNext steps:", 0);
             showDetail("1. flisk resource api --type backend --stack app   # scaffold a service");
             showDetail("2. flisk up app                                     # start it");
             showDetail("\nRuntime readiness:", 0);
             for (const line of runtimeNextSteps)
                 showDetail(line, 0);
-            showDetail("\nAfter editing .tdk/project.json, run `flisk config regenerate`.", 0);
+            showDetail("\nAfter editing .flisk/project.json, run `flisk config regenerate`.", 0);
         }
     });
 });

package/cli/dist/commands/projects.js

@@ -21,7 +21,7 @@ export const projectsCommand = new Command("projects")
         if (!projectRoot) {
             throw errorFactories.notInProject();
         }
-        const outDir = join(projectRoot, ".tdk", ".tdk-out");
+        const outDir = join(projectRoot, ".flisk", ".flisk-out");
         const missing = MASTER_CONFIG_FILES.filter((file) => !existsSync(join(outDir, file)));
         if (options.json) {
             const discovery = createDiscoveryContext();

package/cli/dist/commands/resource.js

@@ -16,7 +16,7 @@ import { addYesOption, assertValid, confirmOrCancel } from "../utils/command-hel
 import { AUTOGENERATED_DIR, BRING_YOUR_OWN_TYPE, PACKAGE_JSON, PORT_RANGES, SERVICE_JSON, } from "../utils/constants.js";
 import { clearDiscoveryCache } from "../utils/discovery-context.js";
 import { chooseResourcePath, isPathDiscovered, readDiscoveryPaths, } from "../utils/discovery-paths.js";
-import { errorFactories, requireProjectRoot, runCommand, TdkError } from "../utils/errors.js";
+import { errorFactories, FliskError, requireProjectRoot, runCommand } from "../utils/errors.js";
 import { writeFilesWithProgress } from "../utils/file-helpers.js";
 import { showCommandHeader } from "../utils/formatting.js";
 import { assignPort } from "../utils/port-assignment.js";
@@ -79,14 +79,14 @@ export function resolveResourcePort(resourceType, value, assignedPort, resources
     const flag = resourceType === BRING_YOUR_OWN_TYPE ? "BYO --port" : "--port";
     const subject = resourceType === BRING_YOUR_OWN_TYPE ? "BYO port" : "Port";
     if (!/^\d+$/.test(value)) {
-        throw new TdkError(`${flag} must be an integer from ${min} through ${max}.`);
+        throw new FliskError(`${flag} must be an integer from ${min} through ${max}.`);
     }
     const port = Number(value);
     if (!Number.isInteger(port) || port < min || port > max) {
-        throw new TdkError(`${flag} must be an integer from ${min} through ${max}.`);
+        throw new FliskError(`${flag} must be an integer from ${min} through ${max}.`);
     }
     if (resources.some((resource) => resource.config?.port === port)) {
-        throw new TdkError(`${subject} ${port} is already assigned to another resource.`);
+        throw new FliskError(`${subject} ${port} is already assigned to another resource.`);
     }
     return port;
 }
@@ -307,14 +307,14 @@ export function parseResourceType(type) {
     const normalized = type === "byo" ? BRING_YOUR_OWN_TYPE : type;
     const validTypes = [...RESOURCE_TYPE_VALUES];
     if (!validTypes.includes(normalized)) {
-        throw new TdkError(`Unknown resource type "${type}". Supported types: ${validTypes.join(", ")}.`, [`Use one of: ${validTypes.join(", ")}`, "Omit --type to create a backend"]);
+        throw new FliskError(`Unknown resource type "${type}". Supported types: ${validTypes.join(", ")}.`, [`Use one of: ${validTypes.join(", ")}`, "Omit --type to create a backend"]);
     }
     return normalized;
 }
 /**
  * Parse an existing `service.json` manifest.
  *
- * Wraps JSON syntax errors in a `TdkError` that names the offending file, so a malformed manifest
+ * Wraps JSON syntax errors in a `FliskError` that names the offending file, so a malformed manifest
  * is reported as a CLI error instead of an unhandled `SyntaxError`. Only the JSON syntax is
  * checked here: the manifest fields themselves are not validated, and a syntactically valid file
  * is returned as-is, including unknown or missing fields.
@@ -322,7 +322,7 @@ export function parseResourceType(type) {
  * @param content - The raw contents of the `service.json` file.
  * @param configPath - Path to the manifest, used in the error message.
  * @returns The parsed manifest.
- * @throws TdkError When the content is not valid JSON.
+ * @throws FliskError When the content is not valid JSON.
  */
 export function parseExistingServiceJson(content, configPath) {
     try {
@@ -330,7 +330,7 @@ export function parseExistingServiceJson(content, configPath) {
     }
     catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
-        throw new TdkError(`Could not parse service.json at ${configPath}: ${reason}`);
+        throw new FliskError(`Could not parse service.json at ${configPath}: ${reason}`);
     }
 }
 /**
@@ -350,7 +350,7 @@ function printFrameworkInventory(options, isTypeExplicit) {
     }
     const resourceType = parseResourceType(options.type ?? "backend");
     if (resourceType !== "frontend" && resourceType !== "backend") {
-        throw new TdkError(`No frameworks are registered for --type ${resourceType}.`, [
+        throw new FliskError(`No frameworks are registered for --type ${resourceType}.`, [
             "Use --type frontend or --type backend to list frameworks",
             "Omit --type to list the frontend frameworks",
         ]);
@@ -387,7 +387,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
     .option("-p, --path <path>", "Custom path for resource directory")
     .option("--resource-path <path>", "Alias for --path (for backward compatibility)")
     .option("--register-existing", "Register an existing resource without creating templates")
-    .option("--ddd", "Scaffold DDD (domain-driven design) folders + path aliases (Premium - requires TDK_LICENSE_KEY)")
+    .option("--ddd", "Scaffold DDD (domain-driven design) folders + path aliases (Premium - requires FLISK_LICENSE_KEY)")
     .option("--dockerfile <path>", "Path to Dockerfile relative to resource dir (for bring-your-own)")
     .option("--health-path <path>", "HTTP health check path (for bring-your-own)", "/health")
     .option("--no-proxy", "Disable the Traefik route (bring-your-own only)")
@@ -413,7 +413,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
         const allResources = discoverResources();
         let resourceName = name;
         if (!resourceName && options.yes) {
-            throw new TdkError("A resource name is required when using --yes.", [
+            throw new FliskError("A resource name is required when using --yes.", [
                 "Pass the name explicitly, for example: flisk resource api --yes.",
             ]);
         }
@@ -433,7 +433,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
         const resourceType = parseResourceType(options.type);
         if (resourceType !== "agent" &&
             (options.runtime !== undefined || options.durability !== undefined)) {
-            throw new TdkError("--runtime and --durability can only be used with --type agent.", [
+            throw new FliskError("--runtime and --durability can only be used with --type agent.", [
                 "Drop --runtime and --durability, or pass --type agent",
             ]);
         }
@@ -501,7 +501,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://flisk.sh/#waitlist) and try again.");
+                        "Set export FLISK_LICENSE_KEY=<key> (request a Premium license at https://flisk.sh/#waitlist) and try again.");
                 }
                 dddEnabled = true;
             }
@@ -519,7 +519,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
             if (existingStacks.length > 0) {
                 if (options.yes) {
                     if (existingStacks.length > 1) {
-                        throw new TdkError("Multiple stacks exist; specify --stack when using --yes.", [
+                        throw new FliskError("Multiple stacks exist; specify --stack when using --yes.", [
                             `Available stacks: ${existingStacks.join(", ")}`,
                         ]);
                     }
@@ -596,12 +596,12 @@ export const resourceCommand = addYesOption(new Command("resource"))
         const isExistingResource = existsSync(fullPath);
         const hasServiceJson = existsSync(resolve(fullPath, SERVICE_JSON));
         if (options.port !== undefined && resourceType === "sdk") {
-            throw new TdkError("--port does not apply to --type sdk.", [
+            throw new FliskError("--port does not apply to --type sdk.", [
                 "Drop --port, or use a service type",
             ]);
         }
         if (resourceType === "sdk" && !hasServiceJson) {
-            throw new TdkError(`No service.json in ${finalResourcePath}`, [
+            throw new FliskError(`No service.json in ${finalResourcePath}`, [
                 'Add one with "appType": "sdk", then run this again to register it',
             ]);
         }
@@ -616,12 +616,12 @@ export const resourceCommand = addYesOption(new Command("resource"))
             : assignPort(resourceType, allResources);
         if (options.restart !== undefined) {
             if (resourceType !== BRING_YOUR_OWN_TYPE) {
-                throw new TdkError("--restart can only be used with --type bring-your-own.", [
+                throw new FliskError("--restart can only be used with --type bring-your-own.", [
                     "Add --type bring-your-own, or drop --restart",
                 ]);
             }
             if (!BYO_RESTART_POLICIES.includes(options.restart)) {
-                throw new TdkError(`Unknown --restart policy "${options.restart}".`, [
+                throw new FliskError(`Unknown --restart policy "${options.restart}".`, [
                     `Use one of: ${BYO_RESTART_POLICIES.join(", ")}`,
                 ]);
             }
@@ -630,7 +630,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
         const requestedFeatures = Array.isArray(options.feature) ? options.feature : [];
         if (requestedFeatures.includes("drizzle") &&
             (resourceType !== "backend" || backendLanguage?.createFiles)) {
-            throw new TdkError("--feature drizzle is only supported for Bun backends.", [
+            throw new FliskError("--feature drizzle is only supported for Bun backends.", [
                 "Use --type backend without --language, or drop --feature drizzle",
             ]);
         }
@@ -977,14 +977,14 @@ This file contains the resource configuration for Flisk.
         const discoveryPaths = readDiscoveryPaths(projectRoot);
         if (pathAdjustedFrom) {
             console.log(chalk.yellow(`\n📁 Placed in ${finalResourcePath} instead of the usual ${pathAdjustedFrom}: ` +
-                `discovery.paths in .tdk/project.json is ${JSON.stringify(discoveryPaths)}, ` +
+                `discovery.paths in .flisk/project.json is ${JSON.stringify(discoveryPaths)}, ` +
                 `so ${pathAdjustedFrom} would never be started by \`flisk up\`.`));
             console.log(chalk.gray("   Use --path to choose another folder."));
         }
         else if (!isPathDiscovered(projectRoot, finalResourcePath, discoveryPaths)) {
             console.log(chalk.yellow(`\n⚠️  ${finalResourcePath} is outside discovery.paths ${JSON.stringify(discoveryPaths)}, ` +
                 "so `flisk up` will not start this resource."));
-            console.log(chalk.gray("   Add a matching pattern to discovery.paths in .tdk/project.json and run `flisk config regenerate`."));
+            console.log(chalk.gray("   Add a matching pattern to discovery.paths in .flisk/project.json and run `flisk config regenerate`."));
         }
         console.log(chalk.gray(`\nNext steps:`));
         console.log(chalk.gray(`  cd ${finalResourcePath}`));

package/cli/dist/commands/resources.js

@@ -4,7 +4,7 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { VALID_RESOURCE_TYPES } from "../utils/constants.js";
 import { createDiscoveryContext } from "../utils/discovery-context.js";
-import { errorFactories, requireProjectRoot, runCommand, TdkError } from "../utils/errors.js";
+import { errorFactories, FliskError, 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";
@@ -29,7 +29,7 @@ export const resourcesCommand = new Command("resources")
             requireProjectRoot();
         }
         if (options.type !== undefined && !includes(VALID_RESOURCE_TYPES, options.type)) {
-            throw new TdkError(`Invalid resource type "${options.type}"`, [
+            throw new FliskError(`Invalid resource type "${options.type}"`, [
                 `Valid types: ${VALID_RESOURCE_TYPES.join(", ")}`,
             ]);
         }

package/cli/dist/commands/restart.js

@@ -3,7 +3,7 @@
 import chalk from "chalk";
 import { Command } from "commander";
 import { STANDARD_PORTS } from "../utils/constants.js";
-import { errorFactories, runCommand, showErrorAndExit, TdkError } from "../utils/errors.js";
+import { errorFactories, FliskError, ProcessExitError, runCommand, showErrorAndExit, } from "../utils/errors.js";
 import { createMachineEnvelope, writeMachineError } from "../utils/machine-output.js";
 import { findProjectRoot } from "../utils/paths.js";
 import { isTiltAvailable, runTilt } from "../utils/tilt.js";
@@ -49,7 +49,7 @@ export const restartCommand = new Command("restart")
                 console.log(JSON.stringify(createMachineEnvelope(null, [{ code: "TILT_NOT_RUNNING", message: msg }])));
                 process.exit(1);
             }
-            throw new TdkError(msg, ["Start the stack first with: flisk up"]);
+            throw new FliskError(msg, ["Start the stack first with: flisk up"]);
         }
         const result = await runTilt("trigger", [resourceName, "--port", portText], {
             inheritStdio: false,
@@ -62,13 +62,13 @@ export const restartCommand = new Command("restart")
                     console.log(JSON.stringify(createMachineEnvelope(null, [{ code: "TILT_NOT_RUNNING", message: msg }])));
                     process.exit(1);
                 }
-                throw new TdkError(msg, ["Start the stack first with: flisk up"]);
+                throw new FliskError(msg, ["Start the stack first with: flisk up"]);
             }
             if (options.json) {
                 console.log(JSON.stringify(createMachineEnvelope(null, [{ code: "TILT_TRIGGER_FAILED", message: detail }])));
                 process.exit(1);
             }
-            throw new TdkError(`Failed to restart ${resourceName}: ${detail}`);
+            throw new FliskError(`Failed to restart ${resourceName}: ${detail}`);
         }
         if (options.json) {
             console.log(JSON.stringify(createMachineEnvelope({ resource: resourceName, restarted: true })));
@@ -81,6 +81,9 @@ export const restartCommand = new Command("restart")
             await action();
         }
         catch (err) {
+            if (err instanceof ProcessExitError) {
+                throw err;
+            }
             writeMachineError(err);
         }
         return;

package/cli/dist/commands/runtime.js

@@ -4,6 +4,7 @@ import { statSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { Command } from "commander";
 import { findCliAssetRoot, loadTemplate } from "../generator/template-engine.js";
+import { describeLayoutProblems, EXTENSION_DIRS, inspectExtensionLayout, resolveExtensionDir, resolveTiltfile, } from "../utils/runtime-layout.js";
 const REQUIRED_ASSET_PATHS = [
     { path: "Tiltfile", directory: false },
     { path: "engine", directory: true },
@@ -13,6 +14,7 @@ const REQUIRED_ASSET_PATHS = [
     { path: "cli/templates", directory: true },
     { path: "shared-platform-engineering/docker-templates", directory: true },
 ];
+const EXTENSION_NAMES = new Set(EXTENSION_DIRS);
 const REQUIRED_TEMPLATES = [
     ".tiltignore.hbs",
     "TILT_RESOURCE_DEFAULTS.star.hbs",
@@ -35,7 +37,11 @@ export const runtimeCommand = new Command("runtime")
     const missing = assetRoot
         ? REQUIRED_ASSET_PATHS.filter(({ path, directory }) => {
             try {
-                const stats = statSync(join(assetRoot, path));
+                const stats = statSync(EXTENSION_NAMES.has(path)
+                    ? resolveExtensionDir(assetRoot, path)
+                    : path === "Tiltfile"
+                        ? resolveTiltfile(assetRoot)
+                        : join(assetRoot, path));
                 return directory ? !stats.isDirectory() : !stats.isFile();
             }
             catch {
@@ -43,6 +49,8 @@ export const runtimeCommand = new Command("runtime")
             }
         }).map(({ path }) => path)
         : REQUIRED_ASSET_PATHS.map(({ path }) => path);
+    const layout = assetRoot ? inspectExtensionLayout(assetRoot) : null;
+    const layoutErrors = assetRoot && layout?.kind === "mixed" ? [describeLayoutProblems(assetRoot, layout)] : [];
     const templateErrors = [];
     if (assetRoot && missing.length === 0) {
         for (const template of REQUIRED_TEMPLATES) {
@@ -54,9 +62,12 @@ export const runtimeCommand = new Command("runtime")
             }
         }
     }
-    const ok = Boolean(assetRoot) && missing.length === 0 && templateErrors.length === 0;
+    const ok = Boolean(assetRoot) &&
+        missing.length === 0 &&
+        layoutErrors.length === 0 &&
+        templateErrors.length === 0;
     if (options.json) {
-        console.log(JSON.stringify({ ok, assetRoot, missing, templateErrors }));
+        console.log(JSON.stringify({ ok, assetRoot, missing, layoutErrors, templateErrors }));
     }
     else if (ok) {
         console.log(`Flisk runtime assets found at ${assetRoot}`);
@@ -67,6 +78,7 @@ export const runtimeCommand = new Command("runtime")
                 ? `Incomplete Flisk runtime assets at ${assetRoot}`
                 : "Flisk runtime assets not found",
             ...missing.map((path) => `Missing: ${path}`),
+            ...layoutErrors,
             ...templateErrors,
         ].join("\n"));
     }

package/cli/dist/commands/stack.js

@@ -5,7 +5,7 @@ import chalk from "chalk";
 import { Command } from "commander";
 import { addYesOption, assertValid, confirmOrCancel } from "../utils/command-helpers.js";
 import { clearDiscoveryCache, createDiscoveryContext } from "../utils/discovery-context.js";
-import { errorFactories, requireProjectRoot, runCommand, TdkError } from "../utils/errors.js";
+import { errorFactories, FliskError, requireProjectRoot, runCommand } from "../utils/errors.js";
 import { writeJsonFile } from "../utils/file-helpers.js";
 import { formatCount, showAllSatisfyCondition, showCommandHeader, showDetail, showSuccess, } from "../utils/formatting.js";
 import { promptMultiSelect, promptText } from "../utils/prompt.js";
@@ -16,7 +16,7 @@ export function parseStackResourceConfig(content, configPath) {
     }
     catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
-        throw new TdkError(`Could not parse service.json at ${configPath}: ${reason}`);
+        throw new FliskError(`Could not parse service.json at ${configPath}: ${reason}`);
     }
 }
 function normalizeResourceNames(names) {
@@ -63,18 +63,18 @@ export const stackCommand = addYesOption(new Command("stack"))
         }
         if (!process.stdin.isTTY) {
             if (options.resources === undefined) {
-                throw new TdkError("Interactive resource selection requires a TTY.", [
+                throw new FliskError("Interactive resource selection requires a TTY.", [
                     "Pass --resources <name...> to select resources without a prompt.",
                     "Use --list to inspect unassigned resources without changing them.",
                 ]);
             }
             if (!stackName) {
-                throw new TdkError("A stack name is required when stdin is not a TTY.", [
+                throw new FliskError("A stack name is required when stdin is not a TTY.", [
                     "Use: flisk stack <stack-name> --resources <name...> [--yes]",
                 ]);
             }
             if (!options.yes) {
-                throw new TdkError("Confirmation requires a TTY.", [
+                throw new FliskError("Confirmation requires a TTY.", [
                     "Pass --yes to skip confirmation when assigning resources without a TTY.",
                 ]);
             }
@@ -97,7 +97,7 @@ export const stackCommand = addYesOption(new Command("stack"))
         if (options.resources !== undefined) {
             const requestedNames = normalizeResourceNames(options.resources);
             if (requestedNames.length === 0) {
-                throw new TdkError("Pass at least one resource name to --resources.", [
+                throw new FliskError("Pass at least one resource name to --resources.", [
                     "Example: `flisk stack api --resources users-api orders-api --yes`",
                 ]);
             }
@@ -109,7 +109,7 @@ export const stackCommand = addYesOption(new Command("stack"))
             }
             const duplicates = [...configPathsByName].filter(([, configPaths]) => configPaths.length > 1);
             if (duplicates.length > 0) {
-                throw new TdkError("Cannot assign resources while duplicate names are present.", duplicates.map(([name, configPaths]) => `Duplicate "${name}" found in ${configPaths.join(" and ")}`));
+                throw new FliskError("Cannot assign resources while duplicate names are present.", duplicates.map(([name, configPaths]) => `Duplicate "${name}" found in ${configPaths.join(" and ")}`));
             }
             const validNames = [...configPathsByName.keys()].sort();
             const resourceByName = new Map(discovery.resources.map((resource) => [resource.name, resource]));
@@ -121,7 +121,7 @@ export const stackCommand = addYesOption(new Command("stack"))
                     throw error;
                 }
                 if (resource.stack) {
-                    throw new TdkError(`Resource "${name}" is already assigned to stack "${resource.stack}".`, ["Run `flisk resources` to review current assignments."]);
+                    throw new FliskError(`Resource "${name}" is already assigned to stack "${resource.stack}".`, ["Run `flisk resources` to review current assignments."]);
                 }
                 selectedResources.push(resource.configPath);
             }