@flisk-sh/flisk 1.3.191 → 1.3.195

package/cli/dist/cli.js

@@ -4,6 +4,7 @@
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { cwd } from "node:process";
+import chalk from "chalk";
 import { showHelp } from "./commands/help.js";
 import { createProgram } from "./program.js";
 import { ensureGlobalInstall } from "./utils/cli-command.js";
@@ -26,7 +27,7 @@ if (process.argv.length === 2) {
 const templateArg = readOptionValue(process.argv, "--template") ?? (await bareTemplateArg(process.argv));
 const projectArg = readOptionValue(process.argv, "--project");
 if (templateArg) {
-    const { cloneProjectTemplate } = await import("./commands/project.js");
+    const { cloneProjectTemplate, templateTargetDir } = await import("./commands/project.js");
     const { assertMachineReadyOrExit, detectRuntimePrerequisites, formatRuntimeNextSteps } = await import("./utils/cold-preflight.js");
     const { PROJECT_TEMPLATES } = await import("./utils/project-templates.js");
     await assertMachineReadyOrExit({ scope: "scaffold" });
@@ -36,18 +37,19 @@ if (templateArg) {
     if (install === "installed") {
         console.log("\n\u2714 flisk is installed globally, so `flisk` works from any folder.");
     }
-    const destination = resolve(cwd(), projectArg || templateArg);
+    const destination = resolve(cwd(), templateTargetDir(templateArg, projectArg));
     const binPath = process.argv[1];
     if (binPath && existsSync(destination)) {
-        const { runStack, findFrontendUrl } = await import("./utils/one-command.js");
-        const { openUrl } = await import("./utils/url-actions.js");
+        const { runStack } = await import("./utils/one-command.js");
+        const { openFirstFrontend } = await import("./commands/open.js");
         console.log(`\n\u{1F680} Starting the stack in ${destination}...\n`);
-        const result = await runStack(binPath, destination);
-        const url = findFrontendUrl(result.output);
-        if (url) {
-            console.log(`\n\u{1F310} Opening ${url}`);
-            await openUrl(url);
-        }
+        await runStack(binPath, destination, process.env, undefined, () => {
+            // The stack printed its URLs: open the first frontend that answers, the same way
+            // `flisk open` does.
+            void openFirstFrontend(destination).catch((error) => {
+                console.log(chalk.yellow(`\nCould not open a browser: ${error instanceof Error ? error.message : String(error)}`));
+            });
+        });
     }
     process.exit(0);
 }

package/cli/dist/commands/help.js

@@ -57,6 +57,7 @@ const COMMAND_GROUPS = [
             { name: "down", desc: "Stop all tilt resources", alias: "" },
             { name: "restart", desc: "Restart a running resource in the stack", alias: "<resource>" },
             { name: "status", desc: "Show status of services and stacks", alias: "" },
+            { name: "open", desc: "Open the first ready frontend in your browser", alias: "" },
             { name: "logs", desc: "Print recent logs from the running stack", alias: "--json" },
         ],
     },

package/cli/dist/commands/open.js

@@ -0,0 +1,85 @@
+// Copyright (c) 2026 Flisk Landscape contributors
+// SPDX-License-Identifier: MIT
+import chalk from "chalk";
+import { Command } from "commander";
+import { discoverResourcesWithProblems } from "../utils/services.js";
+import { showDetail, showStep } from "../utils/formatting.js";
+import { getHostPortPlan } from "../utils/host-port-config.js";
+import { findProjectRoot } from "../utils/paths.js";
+import { resolveServicePath, resolveSubdomainBases } from "../utils/service-urls.js";
+import { readProjectName } from "../utils/shared-infra.js";
+import { openUrl } from "../utils/url-actions.js";
+/** The frontends of the current project, with the URL each one is published under. */
+export async function listFrontendTargets(projectRoot) {
+    const { resources } = discoverResourcesWithProblems(projectRoot);
+    const plan = await getHostPortPlan(projectRoot, { inspectDocker: false });
+    const { appBase } = resolveSubdomainBases(plan?.ingressHttp, projectRoot);
+    return resources
+        .filter((resource) => resource.config?.appType === "frontend")
+        .map((resource) => ({
+        name: resource.name,
+        url: `${appBase}${resolveServicePath(resource)}`,
+    }));
+}
+/** True when the URL answers. A booting frontend needs a moment, so this is asked more than once. */
+export async function isFrontendReady(url, timeoutMs = 2000) {
+    try {
+        const response = await fetch(url, { signal: AbortSignal.timeout(timeoutMs) });
+        return response.status < 500;
+    }
+    catch {
+        return false;
+    }
+}
+/** The first frontend that answers, or the first one when none is up yet. */
+export async function pickReadyFrontend(targets, waitMs = 30000) {
+    if (targets.length === 0)
+        return undefined;
+    const deadline = Date.now() + waitMs;
+    while (true) {
+        for (const target of targets) {
+            if (await isFrontendReady(target.url))
+                return target;
+        }
+        if (Date.now() >= deadline)
+            return targets[0];
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+    }
+}
+/**
+ * Opens the first ready frontend of the project in the browser. Returns the URL it opened, or
+ * null when the project has no frontend.
+ */
+export async function openFirstFrontend(projectRootOverride) {
+    const projectRoot = projectRootOverride ?? findProjectRoot();
+    if (!projectRoot) {
+        console.log(chalk.yellow("Not in a Flisk project, so there is no frontend to open."));
+        console.log(chalk.gray("Run `flisk project --yes` first, or `flisk open` inside a project."));
+        return null;
+    }
+    const targets = await listFrontendTargets(projectRoot);
+    if (targets.length === 0) {
+        console.log(chalk.yellow("This project has no frontend service to open."));
+        console.log(chalk.gray("Start the stack with `flisk up` and add a frontend with `flisk resource`."));
+        return null;
+    }
+    const projectName = readProjectName(projectRoot);
+    showStep(`Opening the first frontend of ${projectName ?? "this project"}`);
+    for (const target of targets) {
+        console.log(chalk.gray(`  - ${target.name}: ${target.url}`));
+    }
+    const first = await pickReadyFrontend(targets);
+    if (!first)
+        return null;
+    const opened = await openUrl(first.url);
+    console.log(opened
+        ? chalk.green(`\nOpened ${first.url}`)
+        : chalk.yellow(`\nCould not open a browser. Open ${first.url} yourself.`));
+    showDetail("Run `flisk open` again to open the next frontend.");
+    return first.url;
+}
+export const openCommand = new Command("open")
+    .description("Open the first frontend of the project in your browser")
+    .action(async () => {
+    await openFirstFrontend();
+});

package/cli/dist/commands/project.js

@@ -78,6 +78,14 @@ function getDefaultCoreServices() {
         .filter((f) => f.enabled_by_default && f.category === "core")
         .map((f) => f.name);
 }
+/** 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) {
@@ -89,7 +97,7 @@ export async function cloneProjectTemplate(templateName, targetDir, runtimeNextS
         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/registry.js

@@ -17,6 +17,7 @@ import { restartCommand } from "./restart.js";
 import { runtimeCommand } from "./runtime.js";
 import { stackCommand } from "./stack.js";
 import { stacksCommand } from "./stacks.js";
+import { openCommand } from "./open.js";
 import { statusCommand } from "./status.js";
 import { uiCommand } from "./ui.js";
 import { upCommand } from "./up.js";
@@ -34,6 +35,7 @@ export function getRegisteredCommands() {
         logsCommand,
         ejectCommand,
         importCommand,
+        openCommand,
         statusCommand,
         stackCommand,
         resourceCommand,

package/cli/dist/utils/one-command.js

@@ -19,10 +19,11 @@ export function findFrontendUrl(output) {
     return undefined;
 }
 /**
- * Runs `flisk up` in the project directory and returns its output. The output is streamed to
- * the terminal as it arrives, so the stack keeps its live progress.
+ * Runs `flisk up` in the project directory and streams its output to the terminal. The stack
+ * keeps running in the foreground, so the caller is told about the frontend URL as soon as it
+ * shows up instead of waiting for the process to exit.
  */
-export function runStack(binPath, cwd, env = process.env, spawnFn = spawn) {
+export function runStack(binPath, cwd, env = process.env, spawnFn = spawn, onFrontendUrl) {
     return new Promise((resolve) => {
         const child = spawnFn(process.execPath, [binPath, "up"], {
             cwd,
@@ -30,10 +31,18 @@ export function runStack(binPath, cwd, env = process.env, spawnFn = spawn) {
             stdio: ["inherit", "pipe", "inherit"],
         });
         let output = "";
+        let announced = false;
         child.stdout?.on("data", (chunk) => {
             const text = String(chunk);
             output += text;
             process.stdout.write(text);
+            if (!announced) {
+                const url = findFrontendUrl(output);
+                if (url) {
+                    announced = true;
+                    onFrontendUrl?.(url);
+                }
+            }
         });
         child.on("error", (error) => resolve({ code: 1, output: `${output}\n${error.message}` }));
         child.on("close", (code) => resolve({ code, output }));

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

@@ -6,7 +6,10 @@ import { PROJECT_JSON } from "./constants.js";
 import { findProjectRoot } from "./paths.js";
 import { isApiServiceType } from "./resource-kind.js";
 export function getProjectName() {
-    const root = findProjectRoot();
+    return getProjectNameFor(findProjectRoot());
+}
+/** The project name of a specific project root, for tools that work outside the current directory. */
+export function getProjectNameFor(root) {
     if (root) {
         try {
             const content = readFileSync(join(root, ".tdk", PROJECT_JSON), "utf-8");
@@ -19,8 +22,8 @@ export function getProjectName() {
     }
     return "tdk-project";
 }
-export function resolveSubdomainBases(ingressPort) {
-    const projectName = getProjectName();
+export function resolveSubdomainBases(ingressPort, projectRoot) {
+    const projectName = getProjectNameFor(projectRoot ?? findProjectRoot());
     const raw = process.env.TDK_SERVICE_BASE_URL ??
         `http://${projectName}.localhost${ingressPort ? `:${ingressPort}` : ""}`;
     try {

package/cli/dist-bundle/chunk-32NCVCS7.js

@@ -0,0 +1,5 @@
+import{createRequire as __tdkRequire}from'node:module';const require=__tdkRequire(import.meta.url);
+import{Va as w,eb as A,f as P,m as T}from"./chunk-DTJ6JCHV.js";import{execFileSync as x}from"node:child_process";import{existsSync as G,mkdirSync as W,readFileSync as D,realpathSync as Y,writeFileSync as q}from"node:fs";import{join as S,resolve as V,sep as X}from"node:path";import{createServer as U}from"node:net";import{connect as K}from"node:net";function N(e,s=500){return new Promise(t=>{let r=K({port:e,host:"127.0.0.1"}),o=n=>{r.destroy(),t(n)};r.setTimeout(s,()=>o(!1)),r.once("connect",()=>o(!0)),r.once("error",()=>o(!1))})}var J={ingressHttp:{start:8080,end:8180},ingressHttps:{start:8443,end:8543},postgres:{start:15432,end:15532}},E={ingressHttp:"TDK_HTTP_PORT",ingressHttps:"TDK_HTTPS_PORT",postgres:"TDK_POSTGRES_PORT"},H={ingressHttp:80,ingressHttps:443,postgres:5432},k={ingressHttp:H.ingressHttp,ingressHttps:H.ingressHttps};function j(e,s){return e==="EACCES"&&s==="darwin"}async function b(e){return await N(e)?!1:new Promise(s=>{let t=U();t.once("error",r=>{s(j(r.code,process.platform))}),t.listen(e,"127.0.0.1",()=>t.close(()=>s(!0)))})}function B(e,s){let t=Number(s);if(!Number.isInteger(t)||t<1||t>65535)throw new Error(`${e} must be an integer between 1 and 65535 (received ${JSON.stringify(s)})`);return t}async function O(e={}){let s=e.env??process.env,t=e.isAvailable??b,r={ingressHttp:!1,ingressHttps:!1,postgres:!1},o={ingressHttp:"",ingressHttps:"",postgres:""},n={explicit:r},c=new Set;for(let a of["ingressHttp","ingressHttps","postgres"]){let f=s[E[a]],i=f!==void 0&&f.trim()!=="",u=e.ranges?.[a]??J[a],p=k[a],h=i?[B(E[a],f)]:[...p===void 0?[]:[p],...Array.from({length:u.end-u.start+1},(g,_)=>u.start+_)],d;for(let g of h)if(!c.has(g)){if(await t(g)){d=g;break}if(i)throw new Error(`${E[a]}=${g} is already in use. Choose a free host port and retry.`)}if(d===void 0)throw new Error(`No available host port in ${u.start}-${u.end} for ${a}. Set ${E[a]} to a free port and retry.`);c.add(d),n[a]=d,r[a]=i,o[a]=i?"explicit override":d===p?"requested port is free":`selected from fallback range ${u.start}-${u.end}`}return{...n,requested:{...H},reason:o}}function ue(e){return`Host ports: HTTP ${e.ingressHttp}, HTTPS ${e.ingressHttps}, Postgres ${e.postgres}`}var R=S(".tdk",".tdk-out","host-ports.json");function Q(e,s,t){return e.split(`
+`).some(r=>{let[o="",n=""]=r.split("|"),c=o.toLowerCase(),a=s.toLowerCase();return(c.startsWith(`${a}_`)||c.startsWith(`${a}-`))&&n.includes(`:${t}->`)})}function F(e){let s=S(e,R);if(!G(s))return null;try{let t=JSON.parse(D(s,"utf-8"));if(!t||typeof t!="object")return null;let r=t;return!Number.isInteger(r.ingressHttp)||!Number.isInteger(r.ingressHttps)||!Number.isInteger(r.postgres)||!r.requested||!r.explicit||!r.reason?null:r}catch{return null}}function Se(e,s){let t=S(e,R);W(S(e,".tdk",".tdk-out"),{recursive:!0}),q(t,`${JSON.stringify(s,null,2)}
+`,{encoding:"utf-8",mode:384})}function _e(e){process.env.TDK_HTTP_PORT=String(e.ingressHttp),process.env.TDK_HTTPS_PORT=String(e.ingressHttps),process.env.TDK_POSTGRES_PORT=String(e.postgres)}var z="com.docker.compose.project.working_dir";function Z(e,s,t){let r=new Set([V(s)]);try{r.add(Y(s))}catch{}return e.split(`
+`).some(o=>{let[,n="",c=""]=o.split("|");return!c||!n.includes(`:${t}->`)?!1:[...r].some(a=>c===a||c.startsWith(`${a}${X}`))})}function Te(e,s,t=()=>x("docker",["ps","--format",`{{.Names}}|{{.Ports}}|{{.Label "${z}"}}`],{encoding:"utf-8",timeout:5e3})){let r=F(e);if(!r||r.ingressHttp===s)return s;try{if(Z(t(),e,r.ingressHttp))return r.ingressHttp}catch{}return s}async function Ee(e,s={}){let t=F(e),r=["TDK_HTTP_PORT","TDK_HTTPS_PORT","TDK_POSTGRES_PORT"].some(i=>process.env[i]);if(s.inspectDocker===!1&&t&&!r)return t;let o="";try{let i=JSON.parse(D(S(e,".tdk",T),"utf-8"));o=String(i?.project?.name??"tdk-project").replace(/-/g,"_").toLowerCase()}catch{o="tdk_project"}let n="";if(s.inspectDocker!==!1)try{n=x("docker",["ps","--format","{{.Names}}|{{.Ports}}"],{encoding:"utf-8",timeout:5e3})}catch{}let c=i=>Q(n,o,i),a=s.isPortFree??b,f=async i=>await a(i)||c(i);if(t&&!r){for(let i of[t.ingressHttp,t.ingressHttps,t.postgres])if(!await f(i))return O({isAvailable:f});for(let[i,u]of Object.entries(k)){let p=t[i];if(u!==void 0&&p!==u&&await f(u))return O({isAvailable:f})}return t}return O({isAvailable:f})}import{existsSync as ee,readFileSync as v}from"node:fs";import{join as l}from"node:path";var $=["postgres",P],L=["pre_alpha","alpha","beta","out_of_scope"];function te(e){return $.includes(e)}function C(e){try{return JSON.parse(v(l(e,".tdk",T),"utf-8"))}catch{return}}function m(e){try{return ee(e)?v(e,"utf-8"):void 0}catch{return}}function I(e,s){let t=o=>{let n=o;for(;n<e.length&&/\s/.test(e[n]);)n+=1;return n},r=0;for(;;){let o=e.indexOf(s,r);if(o===-1)return;let n=t(o+s.length);if(e[n]==="="&&(n=t(n+1),e[n]==="[")){let c=e.indexOf("]",n+1);return c===-1?void 0:[...e.slice(n+1,c).matchAll(/"([^"]+)"|'([^']+)'/g)].map(a=>a[1]??a[2]??"")}r=o+s.length}}function M(e){let s=l(e,".tdk",".tdk-out","Tiltfile"),t=m(s);if(t)return I(t,"ALWAYS_ENABLED_INFRA")}function se(e){let s=l(e,".tdk",".tdk-out","spec.master"),t=m(s);if(t!==void 0)return/"database-management"\s*:\s*True/.test(t)}function re(e){let s=l(e,".tdk",".tdk-out"),t=m(l(s,"Tiltfile")),r=m(l(s,"spec.master")),o=m(l(s,"tdk-cli-ext","discovery","config.star")),n=m(l(s,"tdk-cli-ext","engine","topologies","tilt","config","profiles.star"));if(!t||!r||!o||!n)return!1;let c=r.match(/PRE_ALPHA_RESOURCES\s*=\s*\{([^}]*)\}/)?.[1],a=I(o,"CORE_INFRA");return/FOCUS_MODE\s*,\s*FOCUS_ENABLED_ALL\s*,\s*FOCUS_ENABLED_RESOURCES\s*=\s*Config\.apply_focus\(cfg\)/.test(t)&&/if FOCUS_MODE and FOCUS_ENABLED_ALL\s*:/.test(t)&&/"[^"]+"\s*:\s*True|'[^']+'\s*:\s*True/.test(c??"")&&(a?.includes("postgres")??!1)&&/["']postgres["']\s*:\s*["']database-management["']/.test(o)&&/for infra in CORE_INFRA_EXPORT\s*:/.test(n)&&/needed\[INFRA_STACK_MAP_EXPORT\[infra\]\]\s*=\s*True/.test(n)}function ne(e){let s=C(e);if(!s)return!1;let t=s.phases??{};for(let o of L){let n=t[o]?.enabledStacks;if(Array.isArray(n)&&n.includes(P))return!0}let r=s.always_enabled_infra??A;return Array.isArray(r)&&r.includes(P)}function oe(e,s){let t=new Set;for(let n of $)t.add(n);for(let n of s)t.add(n.name),n.stack&&t.add(n.stack);let r=C(e);if(r){let n=r.phases??{};for(let a of L){let f=n[a]?.enabledStacks;if(Array.isArray(f))for(let i of f)t.add(i)}let c=r.always_enabled_infra??A;if(Array.isArray(c))for(let a of c)t.add(a)}let o=M(e);if(Array.isArray(o))for(let n of o)t.add(n);return t}function be(e,s=w(e)){let t=ne(e),r=M(e),o=Array.isArray(r)&&r.includes(P),n=se(e)===!0,c=t||o||n,a=!t&&re(e),f=oe(e,s),i=[],u=[];for(let d of s){let g=d.config?.dependsOn??[],_=!1;for(let y of g){if(te(y)){_=!0;continue}f.has(y)||u.push({resource:d.name,name:y})}_&&i.push(d.name)}let p=c||i.length>0,h=c?"feature":i.length>0?"dependsOn":"none";return{featureOn:c,featureOnFromProjectJson:t,featureOnFromTiltfile:o,featureOnFromSpecMaster:n,focusWouldEnableDatabaseManagement:a,dependsOnUsers:i,willStart:p,reason:h,unknownDependsOnNames:u}}export{O as a,ue as b,F as c,Se as d,_e as e,Te as f,Ee as g,$ as h,be as i};