@flisk-sh/flisk 1.4.2 → 1.4.5

package/cli/dist/commands/doctor.js

@@ -291,7 +291,8 @@ export async function checkColima() {
         name: "Colima",
         didPass: false,
         message: status.problem ?? "The Colima VM is not running",
-        fix: status.fix,
+        fix: status.fix ??
+            "Start Colima: colima start\n  Verify: colima status\n  Docs: https://github.com/abiosoft/colima",
     };
 }
 export async function checkDockerRuntime() {
@@ -309,7 +310,7 @@ export async function checkDockerRuntime() {
                 name: CONTAINER_RUNTIME_CHECK,
                 didPass: false,
                 message: "Docker is not running",
-                fix: DOCTOR_FIXES.dockerDaemonDown,
+                fix: "Start Docker Desktop, enable WSL2 integration, then retry: flisk doctor\n  Verify: docker ps\n  Docs: https://docs.docker.com/desktop/wsl/",
             };
         }
     }
@@ -327,8 +328,8 @@ export async function checkDockerRuntime() {
             return {
                 name: CONTAINER_RUNTIME_CHECK,
                 didPass: false,
-                message: "Docker daemon is not responding",
-                fix: DOCTOR_FIXES.dockerDaemonDown,
+                message: "Docker daemon is not responding (timeout)",
+                fix: "Restart Docker daemon: systemctl restart docker (Linux) or restart Docker Desktop/Colima\n  Verify: docker ps\n  Docs: https://docs.docker.com/config/daemon/",
             };
         }
     }
@@ -349,7 +350,7 @@ export async function checkDockerRuntime() {
             name: CONTAINER_RUNTIME_CHECK,
             didPass: false,
             message: "Colima is installed but not running",
-            fix: DOCTOR_FIXES.dockerDaemonDown,
+            fix: "Start Colima: colima start\n  Verify: colima status\n  Docs: https://github.com/abiosoft/colima",
         };
     }
     if (await succeeds("podman ps")) {
@@ -364,14 +365,14 @@ export async function checkDockerRuntime() {
             name: CONTAINER_RUNTIME_CHECK,
             didPass: false,
             message: "Docker daemon is not running",
-            fix: DOCTOR_FIXES.dockerDaemonDown,
+            fix: "Start Docker daemon: systemctl start docker (Linux) or start Docker Desktop\n  Verify: docker ps\n  Docs: https://docs.docker.com/engine/daemon/",
         };
     }
     return {
         name: CONTAINER_RUNTIME_CHECK,
         didPass: false,
-        message: "Docker is not running",
-        fix: DOCTOR_FIXES.dockerMissing,
+        message: "Docker is not installed",
+        fix: "Install Docker: https://docs.docker.com/get-docker/\n  Verify: docker --version\n  After install, start Docker and retry: flisk doctor",
     };
 }
 export const checkDockerCompose = createExecCheck("Docker Compose", "docker compose version", "Docker Compose plugin available", "Docker Compose plugin not found", "Install Docker Compose: https://docs.docker.com/compose/install/");
@@ -442,7 +443,7 @@ export async function checkDockerVersions(exec = execAsync) {
         name: "Docker Versions",
         didPass: false,
         message: `Docker is too old for generated healthchecks (they use start_interval):\n    ${problems.join("\n    ")}`,
-        fix: "Update Docker Desktop, or on Linux update docker-ce and the docker-compose-plugin package",
+        fix: "Update Docker: Docker Desktop (auto-updates), or Linux: apt/yum/dnf update docker-ce docker-compose-plugin\n  Verify: docker version --format '{{.Server.Version}}' && docker compose version --short\n  Docs: https://docs.docker.com/engine/install/",
     };
 }
 checkDockerVersions.requiresContainerRuntime = true;
@@ -457,7 +458,7 @@ export async function checkTilt(exec = execAsync) {
             name: "Tilt CLI",
             didPass: false,
             message: "Tilt CLI not found",
-            fix: DOCTOR_FIXES.tiltMissing,
+            fix: "Install Tilt: curl -fsSL https://raw.githubusercontent.com/tilt-dev/tilt/master/scripts/install.sh | bash\n  Verify: tilt version\n  Docs: https://docs.tilt.dev/install.html",
         };
     }
     if (!versionMeetsMinimum(raw, MIN_TILT_VERSION)) {
@@ -465,7 +466,7 @@ export async function checkTilt(exec = execAsync) {
             name: "Tilt CLI",
             didPass: false,
             message: `Tilt ${raw || "version unknown"} is below the required v${MIN_TILT_VERSION.join(".")} floor`,
-            fix: `Install Tilt v${MIN_TILT_VERSION.join(".")} or newer: https://docs.tilt.dev/install.html`,
+            fix: `Upgrade Tilt to v${MIN_TILT_VERSION.join(".")} or newer: https://docs.tilt.dev/install.html\n  Verify: tilt version\n  If using Homebrew: brew upgrade tilt`,
         };
     }
     return { name: "Tilt CLI", didPass: true, message: `Tilt ${raw} is available` };
@@ -490,7 +491,7 @@ export async function checkDockerOperatingSystem(exec = execAsync) {
             name: "Docker OS",
             didPass: false,
             message: `Docker is using the ${osType || "unknown"} engine; Flisk requires Linux containers`,
-            fix: "Switch Docker Desktop to Linux containers, enable WSL2 integration, then retry flisk doctor.",
+            fix: "Switch Docker Desktop to Linux containers: Settings > General > Use the WSL 2 based engine\n  Or on Windows: docker context use default (if using WSL2 backend)\n  Verify: docker info --format '{{.OSType}}'\n  Docs: https://docs.docker.com/desktop/wsl/",
         };
     }
     return { name: "Docker OS", didPass: true, message: "Docker is using Linux containers" };
@@ -522,7 +523,7 @@ export async function checkBun(exec = execAsync) {
                 name: "Bun",
                 didPass: false,
                 message: `Bun ${rawVersion || "version unknown"} is below the required ${MIN_BUN_VERSION.join(".")} floor`,
-                fix: `Install Bun ${MIN_BUN_VERSION.join(".")} or newer: https://bun.sh/install`,
+                fix: `Upgrade Bun to ${MIN_BUN_VERSION.join(".")} or newer: https://bun.sh/install\n  Verify: bun --version\n  If using npm: npm install -g bun@latest`,
             };
         }
         return {
@@ -535,8 +536,8 @@ export async function checkBun(exec = execAsync) {
         return {
             name: "Bun",
             didPass: false,
-            message: "Bun is not available",
-            fix: DOCTOR_FIXES.bunMissing,
+            message: "Bun is not installed",
+            fix: "Install Bun: curl -fsSL https://bun.sh/install | bash\n  Verify: bun --version\n  Docs: https://bun.sh/docs/installation",
         };
     }
 }

package/cli/dist/commands/logs.js

@@ -27,6 +27,7 @@ async function tiltResourceNames(port) {
 }
 export const logsCommand = new Command("logs")
     .description("Print a bounded snapshot of recent logs from the running stack")
+    .showHelpAfterError("\nService names are not positional. Use: flisk logs --service <name>")
     .option("-s, --service <names...>", "Only these services (Tilt resource names)")
     .option("--tail <n>", "Number of most recent lines to return", String(DEFAULT_LOG_TAIL))
     .option("--since <duration>", "Only logs newer than this duration, for example 30s, 5m, 1h")

package/cli/dist/commands/project.js

@@ -214,6 +214,7 @@ const DEFAULT_PROJECT_JSON = {
     overrides: {},
 };
 export const projectCommand = addYesOption(new Command("project"))
+    .alias("init")
     .description("Initialize or validate project-level master configuration")
     .argument("[template]", `Clone a starter example instead of a blank project (${Object.keys(PROJECT_TEMPLATES).join(", ")})`)
     .option("--path <dir>", "Directory to clone the template into (default: the template's repo name)")

package/cli/dist/commands/resource.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2026 Flisk Landscape contributors
 // SPDX-License-Identifier: MIT
 import { existsSync, mkdirSync } from "node:fs";
-import { isAbsolute, relative, resolve } from "node:path";
+import { dirname, isAbsolute, relative, resolve } from "node:path";
 import chalk from "chalk";
 import { Command } from "commander";
 import { DEFAULT_AGENT_RUNTIME, resolveAgentDurability, resolveAgentRuntime, } from "../agent-runtimes/registry.js";
@@ -90,7 +90,7 @@ export function resolveResourcePort(resourceType, value, assignedPort, resources
     }
     return port;
 }
-export function createServiceJson(name, type, stack, port, extraFeatures = [], frameworkId, languageId, agent) {
+export function createServiceJson(name, type, stack, port, extraFeatures = [], frameworkId, languageId, agent, basePath) {
     const framework = resolveFrontendFramework(type, frameworkId);
     // Only an explicit selection is persisted: a missing `language` has always meant Bun.
     const language = languageId === undefined ? undefined : resolveBackendLanguage(type, languageId);
@@ -129,11 +129,15 @@ export function createServiceJson(name, type, stack, port, extraFeatures = [], f
         stack,
         port,
         ...(framework ? { framework: framework.id } : {}),
+        // A server framework (Next.js) is served under /<name>/ with a base path, so the engine's default /health probe finds
+        // nothing there. Probe the framework's own health route under the same prefix.
+        ...(framework?.kind === "server" ? { healthCheckPath: `/${name}/health` } : {}),
         ...(backendFramework && type !== "mcp" && type !== "agent"
             ? { framework: backendFramework.id }
             : {}),
         ...(language ? { language: language.id } : {}),
         ...(type === "agent" && agent ? { agent } : {}),
+        ...(type === "frontend" && basePath ? { basePath } : {}),
     };
 }
 export function createByoServiceJson(name, stack, port, options) {
@@ -173,20 +177,26 @@ export function createPackageJson(name, type, frameworkId, prismaEnabled = false
         version: "0.0.1",
         type: "module",
         scripts: {
-            ...(isFrontend
+            ...(isFrontend && !framework?.scripts
                 ? {
                     predev: requireGeneratedViteConfig(`${AUTOGENERATED_DIR}/vite.config.frontend.autogenerated.ts`),
                     prebuild: requireGeneratedViteConfig(`${AUTOGENERATED_DIR}/vite.config.build.autogenerated.ts`),
                 }
                 : {}),
             dev: isFrontend
-                ? `vite --config ${AUTOGENERATED_DIR}/vite.config.frontend.autogenerated.ts`
+                ? (framework?.scripts?.dev ??
+                    `vite --config ${AUTOGENERATED_DIR}/vite.config.frontend.autogenerated.ts`)
                 : "bun run --watch src/index.ts",
             build: isFrontend
-                ? `tsc && vite build --config ${AUTOGENERATED_DIR}/vite.config.build.autogenerated.ts`
+                ? (framework?.scripts?.build ??
+                    `tsc && vite build --config ${AUTOGENERATED_DIR}/vite.config.build.autogenerated.ts`)
                 : "tsc",
-            // Backends and workers run `start` in their production image; doctor checks for it.
-            ...(isFrontend ? {} : { start: "bun run dist/index.js" }),
+            // Backends and workers run `start` in their production image; doctor checks for it. A server framework brings its own.
+            ...(isFrontend
+                ? framework?.scripts?.start
+                    ? { start: framework.scripts.start }
+                    : {}
+                : { start: "bun run dist/index.js" }),
             test: "vitest",
             lint: "biome check .",
             "lint:fix": "biome check . --write",
@@ -220,7 +230,7 @@ export function createPackageJson(name, type, frameworkId, prismaEnabled = false
             "@biomejs/biome": "^2.5.13",
             // vitest 5 peers on vite ^6.4.0 || ^7 || ^8; vite 5 makes `vitest run` fail at startup with
             // ERR_PACKAGE_PATH_NOT_EXPORTED ('./module-runner'), in every resource once it is hoisted.
-            ...(isFrontend ? { vite: "^6.4.1" } : {}),
+            ...(isFrontend && !framework?.scripts ? { vite: "^6.4.1" } : {}),
             ...(drizzleEnabled ? { "drizzle-kit": DRIZZLE_KIT_RANGE, "@types/pg": "^8.11.0" } : {}),
             ...(framework?.devDependencies ?? {}),
             ...(backendFramework?.devDependencies ?? {}),
@@ -269,6 +279,9 @@ export default defineConfig({
 `;
 export function createResourceTsconfig(resourceType, frameworkId) {
     const framework = resolveFrontendFramework(resourceType, frameworkId);
+    // A server framework (Next.js) owns its compiler settings: the SPA template's `rootDir`, `outDir` and declaration output do not apply.
+    if (framework?.tsconfig)
+        return framework.tsconfig;
     const backendFramework = resolveBackendFramework(resourceType, frameworkId);
     return {
         ...TSCONFIG_TEMPLATE,
@@ -380,7 +393,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
     .description("Create a new resource (service) from scratch, or register an existing one")
     .argument("[name]", "Resource name (kebab-case)")
     .option("-t, --type <type>", "Resource type: backend, frontend, worker, mcp, agent, bring-your-own, sdk", "backend")
-    .option("--framework <id>", "Framework: frontend react (default), vue, svelte, preact, lit, solid, qwik, vanilla, tanstack-router; backend hono (default), express, elysia, fastify, nestjs, koa, h3 (list them with --frameworks)")
+    .option("--framework <id>", "Framework: frontend react (default), vue, svelte, preact, lit, solid, qwik, vanilla, tanstack-router, next; backend hono (default), express, elysia, fastify, nestjs, koa, h3 (list them with --frameworks)")
     .option("--frameworks", "List registered frameworks for the resource type and exit (--type frontend, --type backend)")
     .option("--language <id>", "Backend language: bun (default), python, go, rust, node")
     .option("-s, --stack <stack>", "Stack to assign resource to", "default")
@@ -394,6 +407,7 @@ export const resourceCommand = addYesOption(new Command("resource"))
     .option("--restart <policy>", "Compose restart policy: no, on-failure, unless-stopped, always (bring-your-own only; use no for one-shot jobs)")
     .option("--image <name>", "Docker image name instead of building from Dockerfile (for bring-your-own)")
     .option("--port <port>", "Port for the resource, within its type's range (default: next free port in that range)")
+    .option("--base-path <path>", "Base path for frontend routing (e.g., /storefront). Default is /{stack}s. Frontend only.")
     .option("--feature <feature...>", "Enable a resource feature (for example: prisma, drizzle)")
     .option("--runtime <id>", "Agent runtime (for agent only): custom (default)")
     .option("--durability <kind>", "Where agent sessions are checkpointed (for agent only): files (default, named volume) or postgres")
@@ -757,6 +771,10 @@ This file contains the resource configuration for Flisk.
         }
         if (resourceType === "frontend") {
             mkdirSync(resolve(fullPath, "public"), { recursive: true });
+            // A framework can keep its files in folders of its own (Next.js: src/app).
+            for (const file of frontendFramework?.createFiles(resourceName) ?? []) {
+                mkdirSync(dirname(resolve(fullPath, file.filename)), { recursive: true });
+            }
         }
         if (dddEnabled) {
             for (const layer of ["domain", "application", "infrastructure", "presentation"]) {
@@ -766,11 +784,19 @@ This file contains the resource configuration for Flisk.
         // Prepare file generation tasks
         const prismaEnabled = requestedFeatures.includes("prisma");
         const drizzleEnabled = requestedFeatures.includes("drizzle");
-        const serviceJson = createServiceJson(resourceName, resourceType, stackName, assignedPort, [...(dddEnabled ? ["ddd"] : []), ...requestedFeatures], scaffoldFrameworkId, options.language === undefined ? undefined : backendLanguage?.id, agentConfig);
+        const serviceJson = createServiceJson(resourceName, resourceType, stackName, assignedPort, [...(dddEnabled ? ["ddd"] : []), ...requestedFeatures], scaffoldFrameworkId, options.language === undefined ? undefined : backendLanguage?.id, agentConfig, resourceType === "frontend" ? options.basePath : undefined);
         const packageJson = createPackageJson(resourceName, resourceType, scaffoldFrameworkId, prismaEnabled, agentConfig, drizzleEnabled);
         if (prismaEnabled && resourceType === "backend") {
             serviceJson.dependsOn = [`${resourceName}-migrator`];
         }
+        // A frontend is wired to the first backend already in its stack, so its starter can call that API out of the box.
+        const frontendBackendName = resourceType === "frontend"
+            ? allResources.find((resource) => resource.stack === stackName && resource.type === "backend")?.name
+            : undefined;
+        if (frontendBackendName) {
+            serviceJson.backendName = frontendBackendName;
+            serviceJson.dependsOn = [frontendBackendName];
+        }
         const tasks = [
             {
                 type: "json",
@@ -829,7 +855,9 @@ This file contains the resource configuration for Flisk.
             });
         }
         else if (resourceType === "frontend") {
-            tasks.push(...(frontendFramework?.createFiles(resourceName).map((file) => ({
+            tasks.push(...(frontendFramework
+                ?.createFiles(resourceName, { backendName: frontendBackendName })
+                .map((file) => ({
                 ...file,
                 type: "text",
             })) ?? []));

package/cli/dist/commands/status.js

@@ -55,6 +55,15 @@ export const statusCommand = new Command("status")
         // The same look at Tilt feeds readiness and each service's state, so `flisk status` and `flisk ui` cannot disagree.
         let serviceStates = null;
         const tiltPort = getTiltPollingPort(process.env.TILT_PORT);
+        // Port plan is best effort; service URLs are shown in both JSON and terminal output.
+        let portPlan = null;
+        try {
+            const root = findProjectRoot();
+            portPlan = root ? await getHostPortPlan(root, { inspectDocker: false }) : null;
+        }
+        catch {
+            // Port planning failed; service URLs will be omitted from terminal output.
+        }
         if (tiltAvailable) {
             const text = await tiltGetUiResources(tiltPort);
             // `tilt get` has no -f flag; resources come from the running Tilt's API on its port, the same source as readiness.
@@ -89,14 +98,6 @@ export const statusCommand = new Command("status")
             }
         }
         if (options.json) {
-            let portPlan = null;
-            try {
-                const root = findProjectRoot();
-                portPlan = root ? await getHostPortPlan(root, { inspectDocker: false }) : null;
-            }
-            catch {
-                // Port planning is best effort; stack ports then list only the Tilt UI.
-            }
             const errors = queryError ? [{ code: "TILT_STATUS_UNAVAILABLE", message: queryError }] : [];
             const data = {
                 tilt: {
@@ -178,9 +179,17 @@ export const statusCommand = new Command("status")
                     : state.status === "error"
                         ? chalk.red("✗")
                         : chalk.yellow("…");
-                showDetail(`${mark} ${resource.name}  ${state.status}${state.reason ? ` (${state.reason})` : ""}`);
+                const ports = buildServicePorts(resource, portPlan?.ingressHttp);
+                const urlPart = ports.url ? ` → ${ports.url}` : "";
+                showDetail(`${mark} ${resource.name}${urlPart}  ${state.status}${state.reason ? ` (${state.reason})` : ""}`);
             }
         }
+        else if (discovery.resources.length > 0) {
+            // Without a running Tilt, no service state can be read. Say so instead of printing nothing.
+            console.log();
+            console.log(chalk.bold("Services:"));
+            showDetail(`unknown: no Tilt answers on port ${tiltPort}, so nothing is confirmed running. Start with: flisk up`);
+        }
         if (options.tilt && tiltAvailable) {
             console.log();
             showStep("Tilt Resources:");

package/cli/dist/commands/up.js

@@ -24,10 +24,11 @@ import { nativeWindowsStackRefusal } from "../utils/native-windows.js";
 import { findProjectRoot, getPackageVersion } from "../utils/paths.js";
 import { findAvailablePort } from "../utils/port-assignment.js";
 import { formatPortFallbackNotice } from "../utils/port-fallback-notice.js";
+import { findPortOccupant } from "../utils/port-occupant.js";
 import { isApiServiceType } from "../utils/resource-kind.js";
 import { enforceSchemaVersionGate } from "../utils/schema-version-gate.js";
 import { enforceServiceConfigGate, warnSchemaVersions } from "../utils/service-config-checks.js";
-import { appendHealthPath, resolveSubdomainBases } from "../utils/service-urls.js";
+import { appendHealthPath, resolveServiceUrl, resolveSubdomainBases, } from "../utils/service-urls.js";
 import { discoverResourcesStrict, discoverResourcesWithProblems, discoverStacks, getResourcesForStack, stackExists, warnAboutSkippedFiles, } from "../utils/services.js";
 import { buildSmokePlans, formatSmokeFailure, runSmokePlans, safeSmokeDeps, } from "../utils/smoke.js";
 import { buildStartupReport, formatStartupReport, isStartupStalled, } from "../utils/startup-report.js";
@@ -38,16 +39,53 @@ import { parseTiltPort, resolveTiltPort, secondUpAction, stopTiltForUp, } from "
 import { findUnknownServices, resolveOnlySelection } from "../utils/up-only.js";
 import { tiltGetUiResources, waitForTiltResourcesReady } from "../utils/up-readiness.js";
 import { enableDiscoveredStacks } from "./project.js";
-export function formatUpSuccess(port, appUrls = []) {
-    return [
-        "Flisk is up.",
-        `Tilt UI: http://localhost:${port}`,
-        "App URLs:",
-        ...(appUrls.length > 0
-            ? appUrls.slice(0, 5).map((url) => `  ${url}`)
-            : ["  run: flisk networks"]),
-        "Stop: flisk down",
-    ];
+export function formatUpSuccess(port, options = {}) {
+    const { appUrls = [], serviceHealth = [], showLogsHint = serviceHealth.length > 0 } = options;
+    const lines = [];
+    lines.push("Flisk is up.");
+    lines.push(`Tilt UI: http://localhost:${port}`);
+    if (serviceHealth.length > 0) {
+        lines.push("Services:");
+        for (const svc of serviceHealth.slice(0, 10)) {
+            const icon = svc.status === "ready" ? "✓" : svc.status === "failed" ? "✗" : "⟳";
+            const urlPart = svc.url ? ` → ${svc.url}` : "";
+            lines.push(`  ${icon} ${svc.name}${urlPart}`);
+        }
+        if (serviceHealth.length > 10) {
+            lines.push(`  … and ${serviceHealth.length - 10} more`);
+        }
+        // Health check URLs for test infrastructure and monitoring
+        lines.push("Health checks:");
+        for (const svc of serviceHealth.slice(0, 10)) {
+            const icon = svc.status === "ready" ? "✓" : svc.status === "failed" ? "✗" : "⟳";
+            if (svc.url) {
+                const healthUrl = svc.url.endsWith("/health") ? svc.url : `${svc.url}/health`;
+                lines.push(`  ${icon} ${svc.name}: ${healthUrl}`);
+            }
+        }
+        if (serviceHealth.length > 10) {
+            lines.push(`  … and ${serviceHealth.length - 10} more`);
+        }
+    }
+    else if (appUrls.length > 0) {
+        lines.push("App URLs:");
+        for (const url of appUrls.slice(0, 5)) {
+            lines.push(`  ${url}`);
+        }
+        if (appUrls.length > 5) {
+            lines.push(`   … and ${appUrls.length - 5} more`);
+        }
+    }
+    else {
+        lines.push("App URLs:");
+        lines.push("  run: flisk networks");
+    }
+    lines.push("Stop: flisk down");
+    if (showLogsHint) {
+        lines.push("Logs: flisk logs <service>");
+    }
+    lines.push("Next: flisk help  # or visit https://flisk.sh/docs");
+    return lines;
 }
 /**
  * The native Windows boundary for a command that starts a stack.
@@ -366,8 +404,13 @@ export const upCommand = new Command("up")
                 console.log(chalk.gray(`Refreshed runtime assets: ${copiedAssets.join(", ")}`));
             }
             const newlyEnabledStacks = enableDiscoveredStacks(projectRoot, discoveredResources);
-            if (newlyEnabledStacks.length > 0 && !options.quiet) {
-                console.log(chalk.gray(`Added ${newlyEnabledStacks.join(", ")} to the pre_alpha phase in .flisk/project.json`));
+            if (newlyEnabledStacks.length > 0) {
+                // project.json just changed, so the generated spec.master is now stale. Regenerate it here, or the next
+                // `flisk config verify` reports it out of sync.
+                await generateMasterConfigs(projectRoot, { quiet: options.quiet });
+                if (!options.quiet) {
+                    console.log(chalk.gray(`Added ${newlyEnabledStacks.join(", ")} to the pre_alpha phase in .flisk/project.json`));
+                }
             }
         }
         let servicesToStart;
@@ -413,7 +456,7 @@ export const upCommand = new Command("up")
                 console.log(chalk.blue("\n🌍 Frontend URLs:"));
                 for (const svc of frontends) {
                     const basePath = svc.config?.basePath ?? `/${svc.name}`;
-                    console.log(chalk.gray(`  - ${svc.name}: ${appBase}${chalk.cyan(appendHealthPath(basePath))}`));
+                    console.log(chalk.gray(`  - ${svc.name}: ${appBase}${chalk.cyan(basePath)}`));
                 }
             }
             if (backends.length > 0) {
@@ -605,14 +648,35 @@ export const upCommand = new Command("up")
                             blocked: [],
                             starting: [],
                         };
-                    const reportLines = formatStartupReport(report, readiness.timedOut);
+                    const reportLines = formatStartupReport(report, readiness.timedOut, (port) => findPortOccupant(port));
                     if (reportLines.length > 0) {
                         showError(reportLines.join("\n"));
                     }
                 }
             }
             if (uiReady && !options.quiet && !startupFailed) {
-                for (const line of formatUpSuccess(port))
+                const deferred = getDeferredResourceNames(discoveredResources);
+                const dependsOn = Object.fromEntries(discoveredResources.map((r) => [r.name, r.config?.dependsOn ?? []]));
+                const readiness = await waitForTiltResourcesReady(port, {
+                    deferred,
+                    isStalled: (text) => isStartupStalled(text, dependsOn, deferred),
+                });
+                const serviceHealth = readiness.enabled.map((name) => {
+                    const failed = readiness.failures.find((f) => f.name === name);
+                    const svc = discoveredResources.find((r) => r.name === name);
+                    const isReady = !failed && !readiness.failures.some((f) => f.name === name);
+                    const isStarting = !isReady && !failed;
+                    const url = svc ? resolveServiceUrl(svc, hostPortPlan.ingressHttp) : undefined;
+                    return {
+                        name,
+                        status: failed ? "failed" : isStarting ? "starting" : "ready",
+                        url,
+                    };
+                });
+                for (const line of formatUpSuccess(port, {
+                    serviceHealth,
+                    showLogsHint: true,
+                }))
                     console.log(chalk.blue(line));
                 printedSuccess = true;
             }
@@ -673,7 +737,28 @@ export const upCommand = new Command("up")
             process.exit(1);
         }
         if (!options.quiet && result.exitCode === 0 && !printedSuccess) {
-            for (const line of formatUpSuccess(port))
+            const deferred = getDeferredResourceNames(discoveredResources);
+            const dependsOn = Object.fromEntries(discoveredResources.map((r) => [r.name, r.config?.dependsOn ?? []]));
+            const readiness = await waitForTiltResourcesReady(port, {
+                deferred,
+                isStalled: (text) => isStartupStalled(text, dependsOn, deferred),
+            });
+            const serviceHealth = readiness.enabled.map((name) => {
+                const failed = readiness.failures.find((f) => f.name === name);
+                const svc = discoveredResources.find((r) => r.name === name);
+                const isReady = !failed && !readiness.failures.some((f) => f.name === name);
+                const isStarting = !isReady && !failed;
+                const url = svc ? resolveServiceUrl(svc, hostPortPlan.ingressHttp) : undefined;
+                return {
+                    name,
+                    status: failed ? "failed" : isStarting ? "starting" : "ready",
+                    url,
+                };
+            });
+            for (const line of formatUpSuccess(port, {
+                serviceHealth,
+                showLogsHint: true,
+            }))
                 console.log(chalk.blue(line));
         }
     };