@flisk-sh/flisk 1.4.5 → 1.4.7

package/cli/dist/commands/doctor.js

@@ -14,7 +14,9 @@ import { AUTOGENERATED_DIR, CONTAINER_RUNTIME_CHECK, MASTER_CONFIG_FILES, PACKAG
 import { isPathDiscovered, readDiscoveryPaths } from "../utils/discovery-paths.js";
 import { checkCrashLoopingContainers } from "../utils/doctor-crashloop.js";
 import { applyDoctorFixes, checkDuplicateFliskInstalls, hasFailedActions, planDoctorFixes, projectTiltPids, } from "../utils/doctor-fix.js";
+import { formatFixFirst, rankDoctorFixes } from "../utils/doctor-fix-first.js";
 import { checkDiskSpace, dockerDesktopStuck } from "../utils/doctor-host.js";
+import { checkNativeCommands, checkNativeDependsOn, checkNativeRuntime, checkNativeServiceHealth, } from "../utils/doctor-native.js";
 import { collectDoctorChecks, createDoctorReport, getDoctorExitCode, } from "../utils/doctor-report.js";
 import { checkHealthRoutes, checkIngressPorts, checkPrivateNpmRegistry, checkTiltResourceHealth, projectConfigEnablesVerdaccio, summarizeAdvertisedProbes, summarizeServiceProbes, summarizeSmokeResults, } from "../utils/doctor-runtime.js";
 import { checkStarlarkLoadExports } from "../utils/doctor-starlark.js";
@@ -25,6 +27,7 @@ import { evaluateFliskVersionFloor } from "../utils/flisk-version.js";
 import { formatCount } from "../utils/formatting.js";
 import { getHostPortPlan, resolveRuntimeIngressPort } from "../utils/host-port-config.js";
 import { createHostPortPlan } from "../utils/host-port-plan.js";
+import { findNativeProject } from "../utils/native-project.js";
 import { findProjectRoot, getPackageVersion } from "../utils/paths.js";
 import { promptConfirm } from "../utils/prompt.js";
 import { EnvUnreadableError, envSecretValues, redactSecrets, redactValue, } from "../utils/secret-redaction.js";
@@ -1214,6 +1217,15 @@ function printDoctorResults(list) {
 }
 export function renderDoctorOutput(machineResults, projectResults, inProject, options = {}, allResults) {
     const results = allResults ?? [...machineResults, ...projectResults];
+    const printFixFirst = () => {
+        const lines = formatFixFirst(rankDoctorFixes(results));
+        if (lines.length === 0)
+            return;
+        console.log(chalk.bold("Fix first"));
+        for (const line of lines)
+            console.log(line);
+        console.log("");
+    };
     if (options.all) {
         console.log(chalk.bold("Machine"));
         printDoctorResults(machineResults);
@@ -1228,10 +1240,12 @@ export function renderDoctorOutput(machineResults, projectResults, inProject, op
         }
         console.log("");
         console.log(formatDoctorSummary(results));
+        printFixFirst();
     }
     else {
         printDoctorResults(results);
         console.log("");
+        printFixFirst();
         const allPassed = results.every((check) => check.didPass || check.isSkipped || check.isWarning);
         if (allPassed && !inProject) {
             console.log(`${chalk.gray("○")} ${chalk.gray("Not in a Flisk project, so project checks were skipped")}`);
@@ -1285,8 +1299,13 @@ export const doctorCommand = new Command("doctor")
         process.exit(2);
         return;
     }
+    // A project whose services all declare `command` runs as local processes: doctor checks only what they need (#2231).
+    const nativeProject = findNativeProject();
+    const nativeResources = nativeProject?.resources ?? null;
     if (!options.json) {
-        console.log("Flisk doctor checks your local Docker + Tilt development environment; it does not check cluster deployments.");
+        console.log(nativeResources
+            ? "Flisk doctor checks what this project's local processes need; its services declare commands, so Docker and Tilt are not checked."
+            : "Flisk doctor checks your local Docker + Tilt development environment; it does not check cluster deployments.");
     }
     const host = detectHost();
     if (process.platform === "win32") {
@@ -1343,10 +1362,15 @@ export const doctorCommand = new Command("doctor")
         console.log(`\n${chalk.bold("🔍 Flisk Doctor")}\n`);
         console.log("Checking environment...\n");
     }
-    const projectRoot = findProjectRoot();
+    // A directory of command services is a project for doctor even before `flisk up` writes its .flisk/project.json.
+    const projectRoot = findProjectRoot() ?? nativeProject?.projectRoot ?? null;
     // Repairs run before the checks so the checks report the state after the fix.
     let fixActions;
-    if (options.fix) {
+    if (options.fix && nativeResources) {
+        // The repairs are for Docker networks and Tilt probes, which a project of local processes does not have.
+        fixActions = [];
+    }
+    else if (options.fix) {
         try {
             let projectName;
             if (projectRoot) {
@@ -1388,16 +1412,19 @@ export const doctorCommand = new Command("doctor")
         if (!options.json)
             printFixActions(fixActions, options.dryRun);
     }
+    // The host port plan places the gateway and Postgres containers; a project of local processes has neither.
     let hostPortPlan;
     let portPlanError;
-    try {
-        hostPortPlan = await getHostPortPlan(projectRoot ?? process.cwd());
-    }
-    catch (error) {
-        hostPortPlan = null;
-        portPlanError = error instanceof Error ? error.message : String(error);
+    if (!nativeResources) {
+        try {
+            hostPortPlan = await getHostPortPlan(projectRoot ?? process.cwd());
+        }
+        catch (error) {
+            hostPortPlan = null;
+            portPlanError = error instanceof Error ? error.message : String(error);
+        }
     }
-    const machineChecks = [
+    const containerMachineChecks = [
         () => hostPortPlan
             ? {
                 name: "Host Ports",
@@ -1434,7 +1461,7 @@ export const doctorCommand = new Command("doctor")
         requiresContainerRuntime("Docker Network Pool", () => checkDockerNetworkCapacity()),
         () => checkDuplicateFliskInstalls(),
     ];
-    const projectChecks = [
+    const containerProjectChecks = [
         () => checkFliskVersion(),
         checkMasterConfigs,
         checkGeneratedProjectRuntimeAssets,
@@ -1495,8 +1522,31 @@ export const doctorCommand = new Command("doctor")
         // When Tilt is up, surface red resources (Traefik/apps never started).
         requiresContainerRuntime("Tilt Resources", checkTiltResourceHealth),
     ];
+    const machineChecks = nativeResources
+        ? [
+            () => checkNativeRuntime(nativeResources),
+            () => checkNativeCommands(nativeResources),
+            () => checkWslProjectLocation(findProjectRoot() ?? process.cwd(), options.strict),
+            () => checkDuplicateFliskInstalls(),
+        ]
+        : containerMachineChecks;
+    const projectChecks = nativeResources
+        ? [
+            () => checkFliskVersion(),
+            () => checkDuplicateResourceNames(),
+            () => checkDependsOnShape(),
+            () => checkNativeDependsOn(nativeResources),
+            () => checkCircularDependencies(),
+            () => checkServicePorts(),
+            () => checkSchemaVersions(undefined, options.strict),
+            () => checkDuplicateResourcePorts(),
+        ]
+        : containerProjectChecks;
+    if (options.ping && nativeResources && projectRoot) {
+        projectChecks.push(() => checkNativeServiceHealth(projectRoot, nativeResources, pingTimeout));
+    }
     // Runs last: needs routable services (and working Traefik) to mean anything.
-    if (options.ping) {
+    if (options.ping && !nativeResources) {
         // Probe the port a running stack is actually on, not the one the next `flisk up` would pick.
         const pingPort = projectRoot
             ? resolveRuntimeIngressPort(projectRoot, hostPortPlan?.ingressHttp)

package/cli/dist/commands/down.js

@@ -8,8 +8,10 @@ import { pruneProjectNetworks, stopProjectTiltUp, waitForTiltUpExit, } from "../
 import { errorFactories, handleTiltFailure, withTiltCheck } from "../utils/errors.js";
 import { createJsonEmitter } from "../utils/json-output.js";
 import { writeMachineError } from "../utils/machine-output.js";
+import { readNativeRunState, stopNativeRun } from "../utils/native-runtime.js";
+import { isNativeProject } from "../utils/native-service.js";
 import { findProjectRoot } from "../utils/paths.js";
-import { discoverResources, discoverStacks } from "../utils/services.js";
+import { discoverResources, discoverResourcesFromRoot, discoverStacks } from "../utils/services.js";
 import { buildTiltDownArgs, getTiltfilePath, runTilt } from "../utils/tilt.js";
 function allStackNames() {
     try {
@@ -20,6 +22,17 @@ function allStackNames() {
         return undefined;
     }
 }
+/** True when `flisk down` stops local processes instead of Tilt: a native run is on record, or every service declares `command`. */
+function isNativeRun(projectRoot) {
+    if (readNativeRunState(projectRoot))
+        return true;
+    try {
+        return isNativeProject(discoverResourcesFromRoot(projectRoot));
+    }
+    catch {
+        return false;
+    }
+}
 function pruneNetworksOrWarn(json) {
     const root = findProjectRoot();
     if (!root)
@@ -64,6 +77,25 @@ export const downCommand = addYesOption(new Command("down"))
         }
     }
     const emit = options.json ? createJsonEmitter("DOWN_FAILED", "flisk down") : undefined;
+    // A project of `command` services (or one with a native run on record) stops without Docker or Tilt.
+    const projectRoot = findProjectRoot();
+    if (isNativeRun(projectRoot)) {
+        if (emit && options.dryRun) {
+            emit({ ok: true, dryRun: true, runtime: "native" });
+            return;
+        }
+        if (handleDryRun(options, "not stopping local processes", "stop the local processes of this project")) {
+            return;
+        }
+        const stopped = await stopNativeRun(projectRoot);
+        if (!options.json) {
+            console.log(stopped.wasRunning
+                ? chalk.blue(`Stopped local processes: ${stopped.services.join(", ")}`)
+                : chalk.gray("Nothing is running for this project."));
+        }
+        emit?.({ ok: true, runtime: "native", stopped: stopped.services });
+        return;
+    }
     await withTiltCheck(async () => {
         if (emit && options.dryRun) {
             emit({ ok: true, dryRun: true });

package/cli/dist/commands/logs.js

@@ -2,12 +2,18 @@
 // SPDX-License-Identifier: MIT
 import { Command } from "commander";
 import { STANDARD_PORTS } from "../utils/constants.js";
+import { getDeferredResourceNames } from "../utils/doctor-runtime.js";
 import { errorFactories, FliskError, runCommand, showErrorAndExit } from "../utils/errors.js";
 import { createMachineEnvelope } from "../utils/machine-output.js";
+import { nativeServiceStates, readNativeLogLines } from "../utils/native-runtime.js";
+import { isNativeProject } from "../utils/native-service.js";
 import { findProjectRoot } from "../utils/paths.js";
 import { EnvUnreadableError, envSecretValues, redactSecrets, redactValue, } from "../utils/secret-redaction.js";
+import { deriveServiceStates } from "../utils/service-runtime-state.js";
+import { discoverResourcesFromRoot } from "../utils/services.js";
+import { unhealthyServiceNames } from "../utils/status-groups.js";
 import { isTiltAvailable, runTilt } from "../utils/tilt.js";
-import { DEFAULT_LOG_TAIL, isTiltConnectionFailure, isValidPort, isValidSince, isValidTail, MAX_LOG_TAIL, parseTiltLogLines, } from "../utils/tilt-logs.js";
+import { DEFAULT_LOG_TAIL, isTiltConnectionFailure, isValidPort, isValidSince, isValidTail, MAX_LOG_TAIL, parseTiltLogLines, sinceMilliseconds, } from "../utils/tilt-logs.js";
 import { tiltUnreachableMessage } from "../utils/tilt-unreachable-message.js";
 /** Resource names Tilt knows about, or null when they cannot be listed (the logs call then reports the real error). */
 async function tiltResourceNames(port) {
@@ -25,12 +31,56 @@ async function tiltResourceNames(port) {
         return null;
     }
 }
+/** Raw `tilt get uiresources` JSON, or null when Tilt cannot be read. */
+async function tiltResourcesJson(port) {
+    try {
+        const result = await runTilt("get", ["uiresources", "-o", "json", "--port", port], {
+            inheritStdio: false,
+        });
+        return result.exitCode === 0 ? result.stdout : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Failing or pending services among the project's, from the running Tilt; null when Tilt cannot be read. */
+async function tiltUnhealthyNames(projectRoot, port) {
+    const text = await tiltResourcesJson(port);
+    if (!text)
+        return null;
+    let resources = [];
+    try {
+        resources = discoverResourcesFromRoot(projectRoot);
+    }
+    catch {
+        // Without discovery there are no dependsOn edges; Tilt's own states still decide.
+    }
+    try {
+        const states = deriveServiceStates(text, Object.fromEntries(resources.map((r) => [r.name, r.config?.dependsOn ?? []])), getDeferredResourceNames(resources));
+        return unhealthyServiceNames(Object.keys(states).map((name) => ({ name })), states);
+    }
+    catch {
+        return null;
+    }
+}
+/** The project's services when every one declares `command` (they run as local processes), else null. */
+function nativeResources(projectRoot) {
+    try {
+        const resources = discoverResourcesFromRoot(projectRoot);
+        return isNativeProject(resources) ? resources : null;
+    }
+    catch {
+        // Discovery problems are reported by the commands that start the stack; logs still asks Tilt.
+        return null;
+    }
+}
 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")
+    .option("--unhealthy", "Only services that are failing or still starting", false)
     .option("--port <n>", "Tilt UI port (default: TILT_PORT or 10350)")
     .option("--json", "Output one JSON object and exit", false)
     .action(async (options) => {
@@ -64,6 +114,19 @@ export const logsCommand = new Command("logs")
         fail("USAGE", "--port must be a valid port number", 2);
     const tail = Number(options.tail);
     const services = options.service ?? [];
+    const reportAllHealthy = () => {
+        if (options.json) {
+            console.log(JSON.stringify(createMachineEnvelope({
+                services,
+                tail,
+                since: options.since ?? null,
+                lines: [],
+                unhealthy: [],
+            })));
+            return;
+        }
+        console.log("All services are healthy; nothing to show with --unhealthy.");
+    };
     const action = async () => {
         const projectRoot = findProjectRoot();
         if (!projectRoot) {
@@ -81,6 +144,37 @@ export const logsCommand = new Command("logs")
                 "Fix the read permission on .env, or move it out of the project",
             ]);
         }
+        // A project of `command` services keeps its output in .flisk/native/logs, so no Tilt is involved.
+        const resources = nativeResources(projectRoot);
+        if (resources) {
+            const known = resources.map((resource) => resource.name);
+            const unknown = services.filter((name) => !known.includes(name));
+            if (unknown.length > 0) {
+                const error = errorFactories.unknownServices(unknown, known);
+                fail("UNKNOWN_SERVICE", error.message, error.exitCode, error.suggestions);
+            }
+            let selected = services.length > 0 ? services : known;
+            if (options.unhealthy) {
+                const states = nativeServiceStates(projectRoot, known);
+                const bad = new Set(unhealthyServiceNames(resources, states));
+                selected = selected.filter((name) => bad.has(name));
+                if (selected.length === 0)
+                    return reportAllHealthy();
+            }
+            const lines = readNativeLogLines(projectRoot, selected, {
+                tail,
+                sinceMs: options.since === undefined ? undefined : sinceMilliseconds(options.since),
+            });
+            if (options.json) {
+                console.log(JSON.stringify(redactValue(createMachineEnvelope({ services, tail, since: options.since ?? null, lines }), secrets)));
+                return;
+            }
+            const width = Math.max(0, ...lines.map((line) => line.resource.length));
+            for (const line of lines) {
+                console.log(redactSecrets(`${line.resource.padEnd(width)} | ${line.text}`, secrets));
+            }
+            return;
+        }
         if (!(await isTiltAvailable())) {
             fail("TILT_MISSING", "Tilt is not installed. Run: flisk doctor");
         }
@@ -93,14 +187,24 @@ export const logsCommand = new Command("logs")
                 fail("UNKNOWN_SERVICE", error.message, error.exitCode, suggestions);
             }
         }
+        let selectedServices = services;
+        if (options.unhealthy) {
+            const bad = await tiltUnhealthyNames(projectRoot, portText);
+            if (bad === null)
+                fail("TILT_NOT_RUNNING", tiltUnreachableMessage(portText));
+            selectedServices =
+                services.length > 0 ? services.filter((n) => bad?.includes(n)) : (bad ?? []);
+            if (selectedServices.length === 0)
+                return reportAllHealthy();
+        }
         const args = ["--port", portText, "--tail", String(tail)];
         if (options.since !== undefined)
             args.push("--since", options.since);
         if (options.json)
             args.push("--json");
         // `--` so a service name that starts with "-" is never read as a Tilt flag.
-        if (services.length > 0)
-            args.push("--", ...services);
+        if (selectedServices.length > 0)
+            args.push("--", ...selectedServices);
         const result = await runTilt("logs", args, { inheritStdio: false });
         if (result.exitCode !== 0) {
             const detail = result.stderr.trim();

package/cli/dist/commands/project.js

@@ -8,6 +8,7 @@ import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import { Command } from "commander";
 import { generateMasterConfigs, readProjectConfig } from "../generator/template-engine.js";
+import { installAgentSkills } from "../utils/agent-skills.js";
 import { addYesOption } from "../utils/command-helpers.js";
 import { MASTER_CONFIG_FILES, PROJECT_JSON } from "../utils/constants.js";
 import { clearDiscoveryCache } from "../utils/discovery-context.js";
@@ -213,6 +214,17 @@ const DEFAULT_PROJECT_JSON = {
     },
     overrides: {},
 };
+/**
+ * Writes .flisk/project.json with the defaults `flisk project --yes` uses, and nothing else: no generated Tiltfile, Compose file,
+ * .env or engine copy. `flisk up` uses it to adopt a directory of `command` services as a project, so `flisk down` and
+ * `flisk doctor` find it afterwards.
+ */
+export function writeDefaultProjectConfig(projectRoot) {
+    const projectConfig = JSON.parse(JSON.stringify(DEFAULT_PROJECT_JSON));
+    projectConfig.project.name = basename(projectRoot) || "my-project";
+    ensureDirectory(join(projectRoot, ".flisk"));
+    writeJsonFile(join(projectRoot, ".flisk", PROJECT_JSON), projectConfig);
+}
 export const projectCommand = addYesOption(new Command("project"))
     .alias("init")
     .description("Initialize or validate project-level master configuration")
@@ -222,6 +234,7 @@ export const projectCommand = addYesOption(new Command("project"))
     .option("--force", "Overwrite existing configuration (dangerous)")
     .option("--config-file <path>", "Load project config from existing JSON file")
     .option("-q, --quiet", "Only print what fails; used by `flisk demo`", false)
+    .option("--no-agent-skills", "Do not write the Flisk agent skills (.claude/skills, .agents/skills) and AGENTS.md")
     .action(async (template, options) => {
     const { assertMachineReadyOrExit, detectRuntimePrerequisites, formatRuntimeNextSteps } = await import("../utils/cold-preflight.js");
     // Project setup only writes files: it must not need a running Docker daemon
@@ -482,6 +495,20 @@ export const projectCommand = addYesOption(new Command("project"))
         if (ignored.length > 0 && !quiet) {
             showSuccess(`Added to .gitignore: ${ignored.join(", ")}`);
         }
+        // A coding agent opened in the project then knows to build and run the app with Flisk.
+        // The project works without them, so a failure here is a warning, not an exit.
+        if (options.agentSkills !== false) {
+            try {
+                const skillFiles = installAgentSkills(projectRoot);
+                if (skillFiles.length > 0 && !quiet) {
+                    showSuccess("Added agent skills: .claude/skills, .agents/skills and AGENTS.md (start with flisk-build)");
+                }
+            }
+            catch (error) {
+                const reason = error instanceof Error ? error.message : String(error);
+                console.log(chalk.yellow(`⚠️  Could not add the agent skills: ${reason}`));
+            }
+        }
         if (!quiet) {
             console.log(chalk.green("\n✅ Project configuration complete!"));
             showDetail("\nGenerated files in .flisk/.flisk-out/:", 0);

package/cli/dist/commands/resource.js

@@ -231,7 +231,9 @@ export function createPackageJson(name, type, frameworkId, prismaEnabled = false
             // 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 && !framework?.scripts ? { vite: "^6.4.1" } : {}),
-            ...(drizzleEnabled ? { "drizzle-kit": DRIZZLE_KIT_RANGE, "@types/pg": "^8.11.0" } : {}),
+            ...(drizzleEnabled ? { "drizzle-kit": DRIZZLE_KIT_RANGE } : {}),
+            // Both import 'pg' (src/db.ts, the agent's checkpoint store); without the types the image's `tsc` fails with TS7016.
+            ...(drizzleEnabled || isPostgresAgent ? { "@types/pg": "^8.11.0" } : {}),
             ...(framework?.devDependencies ?? {}),
             ...(backendFramework?.devDependencies ?? {}),
         },

package/cli/dist/commands/status.js

@@ -8,9 +8,12 @@ import { runCommand } from "../utils/errors.js";
 import { formatCount, showDetail, showStep } from "../utils/formatting.js";
 import { getHostPortPlan } from "../utils/host-port-config.js";
 import { createMachineEnvelope, writeMachineError } from "../utils/machine-output.js";
+import { nativeServiceStates } from "../utils/native-runtime.js";
+import { isNativeProject } from "../utils/native-service.js";
 import { findProjectRoot } from "../utils/paths.js";
 import { deriveServiceStates } from "../utils/service-runtime-state.js";
 import { groupSharedPostgres, readProjectName } from "../utils/shared-infra.js";
+import { groupServicesByStack, unhealthyServiceNames } from "../utils/status-groups.js";
 import { buildServicePorts, buildStackPorts } from "../utils/status-ports.js";
 import { isTiltAvailable, runTilt } from "../utils/tilt.js";
 import { getTiltPollingPort } from "../utils/tilt-startup.js";
@@ -22,6 +25,7 @@ export const statusCommand = new Command("status")
     .option("--stacks", "Show stack information (default)", true)
     .option("--resources", "Show all discovered resources", false)
     .option("--tilt", "Show tilt resource status", false)
+    .option("--unhealthy", "Show only services that are failing or still starting", false)
     .action(async (options) => {
     const action = async () => {
         // Discover first: outside a project this fails before any status line is printed.
@@ -31,19 +35,30 @@ export const statusCommand = new Command("status")
         const sharedInfraGroup = projectName
             ? groupSharedPostgres(projectName, discovery.stacks)
             : null;
+        // A project of `command` services runs as local processes: its state comes from the run on record, not from Tilt.
+        const nativeStates = projectRoot && isNativeProject(discovery.resources)
+            ? nativeServiceStates(projectRoot, discovery.resources.map((resource) => resource.name))
+            : null;
         let tiltAvailable = false;
-        try {
-            tiltAvailable = await isTiltAvailable();
-        }
-        catch {
-            // Tilt not available (spawn error)
-            tiltAvailable = false;
+        if (!nativeStates) {
+            try {
+                tiltAvailable = await isTiltAvailable();
+            }
+            catch {
+                // Tilt not available (spawn error)
+                tiltAvailable = false;
+            }
         }
         if (!options.json) {
             showStep("Flisk Status\n");
-            console.log(chalk.bold("Tilt:"), tiltAvailable ? chalk.green("available") : chalk.red("not found"));
-            if (!tiltAvailable) {
-                showDetail("Install Tilt: https://docs.tilt.dev/install.html");
+            if (nativeStates) {
+                console.log(chalk.bold("Runtime:"), "local processes (no Docker, no Tilt)");
+            }
+            else {
+                console.log(chalk.bold("Tilt:"), tiltAvailable ? chalk.green("available") : chalk.red("not found"));
+                if (!tiltAvailable) {
+                    showDetail("Install Tilt: https://docs.tilt.dev/install.html");
+                }
             }
             console.log();
         }
@@ -53,7 +68,7 @@ export const statusCommand = new Command("status")
         // Tilt answers or its output cannot be read.
         let readiness = null;
         // The same look at Tilt feeds readiness and each service's state, so `flisk status` and `flisk ui` cannot disagree.
-        let serviceStates = null;
+        let serviceStates = nativeStates;
         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;
@@ -99,7 +114,23 @@ export const statusCommand = new Command("status")
         }
         if (options.json) {
             const errors = queryError ? [{ code: "TILT_STATUS_UNAVAILABLE", message: queryError }] : [];
+            // A native run answers the readiness question agents poll (data.tilt.readiness.ready) from its own run state.
+            if (nativeStates) {
+                const states = Object.entries(nativeStates);
+                const isRunning = states.some(([, state]) => state.status !== "unknown");
+                readiness = isRunning
+                    ? {
+                        ready: states.every(([, state]) => state.status === "ready"),
+                        failures: [],
+                        pending: states.filter(([, state]) => state.status !== "ready").length,
+                        timedOut: false,
+                        enabled: states.map(([name]) => name),
+                    }
+                    : null;
+            }
             const data = {
+                // Only a project of local processes says so; a container project's report keeps its shape.
+                ...(nativeStates ? { runtime: "native" } : {}),
                 tilt: {
                     available: tiltAvailable,
                     resourcesQueried: options.tilt && tiltAvailable,
@@ -126,9 +157,12 @@ export const statusCommand = new Command("status")
                     name: stack.name,
                     resourceCount: stack.resourceCount,
                     resources: stack.resources.map((resource) => resource.name),
+                    healthyCount: stack.resources.filter((resource) => serviceStates?.[resource.name]?.status === "ready").length,
                 })),
                 unassignedResources: discovery.unassignedResources.map((resource) => resource.name),
                 sharedInfra: sharedInfraGroup,
+                // Names of the failing or pending services, so a caller need not filter `resources` itself.
+                unhealthy: unhealthyServiceNames(discovery.resources, serviceStates),
             };
             console.log(JSON.stringify(createMachineEnvelope(data, errors)));
             if (errors.length > 0) {
@@ -139,27 +173,29 @@ export const statusCommand = new Command("status")
         }
         console.log(chalk.bold("Resources:"), `${discovery.resources.length} discovered`);
         console.log(chalk.bold("Stacks:"), `${discovery.stacks.length} defined`);
-        if (discovery.stacks.length > 0) {
+        const hasStates = serviceStates !== null && Object.keys(serviceStates).length > 0;
+        const unhealthyOnly = Boolean(options.unhealthy);
+        // With service states the grouped "Services:" section below replaces the plain per-stack counts.
+        if (!hasStates && !unhealthyOnly) {
             for (const stack of discovery.stacks) {
-                const resourcesInStack = stack.resources.length;
-                showDetail(`${stack.name}: ${formatCount(resourcesInStack, "resource")}`);
+                showDetail(`${stack.name}: ${formatCount(stack.resources.length, "resource")}`);
                 if (options.verbose) {
                     for (const resource of stack.resources) {
                         showDetail(`${resource.name}`, 6);
                     }
                 }
             }
-        }
-        if (discovery.unassignedResources.length > 0) {
-            console.log();
-            console.log(chalk.yellow(`${formatCount(discovery.unassignedResources.length, "resource")} not in any stack:`));
-            if (options.verbose) {
-                for (const resource of discovery.unassignedResources) {
-                    showDetail(`${resource.name}`);
+            if (discovery.unassignedResources.length > 0) {
+                console.log();
+                console.log(chalk.yellow(`${formatCount(discovery.unassignedResources.length, "resource")} not in any stack:`));
+                if (options.verbose) {
+                    for (const resource of discovery.unassignedResources) {
+                        showDetail(`${resource.name}`);
+                    }
                 }
             }
         }
-        if (sharedInfraGroup) {
+        if (sharedInfraGroup && !unhealthyOnly) {
             console.log();
             console.log(chalk.bold("Shared infrastructure:"));
             showDetail(`${sharedInfraGroup.name} (one instance, ${formatCount(sharedInfraGroup.databases.length, "database")})`);
@@ -167,21 +203,33 @@ export const statusCommand = new Command("status")
                 showDetail(`  ${database.name} (stack ${database.stack}): ${database.services.join(", ")}`);
             }
         }
-        if (serviceStates && Object.keys(serviceStates).length > 0) {
+        if (hasStates && serviceStates) {
+            const states = serviceStates;
             console.log();
-            console.log(chalk.bold("Services:"));
-            for (const resource of discovery.resources) {
-                const state = serviceStates[resource.name];
-                if (!state)
+            console.log(chalk.bold(unhealthyOnly ? "Unhealthy services:" : "Services:"));
+            const unhealthy = new Set(unhealthyServiceNames(discovery.resources, states));
+            if (unhealthyOnly && unhealthy.size === 0) {
+                showDetail(chalk.green("All services are healthy."));
+            }
+            for (const group of groupServicesByStack(discovery.stacks, discovery.unassignedResources, states)) {
+                const shown = group.resources.filter((resource) => states[resource.name] && (!unhealthyOnly || unhealthy.has(resource.name)));
+                if (unhealthyOnly && shown.length === 0)
                     continue;
-                const mark = state.status === "ready"
-                    ? chalk.green("✓")
-                    : state.status === "error"
-                        ? chalk.red("✗")
-                        : chalk.yellow("…");
-                const ports = buildServicePorts(resource, portPlan?.ingressHttp);
-                const urlPart = ports.url ? ` → ${ports.url}` : "";
-                showDetail(`${mark} ${resource.name}${urlPart}  ${state.status}${state.reason ? ` (${state.reason})` : ""}`);
+                const summary = `${group.healthy}/${group.total} healthy`;
+                showDetail(`${chalk.bold(group.name)}: ${group.healthy === group.total ? chalk.green(summary) : chalk.yellow(summary)}`);
+                for (const resource of shown) {
+                    const state = states[resource.name];
+                    if (!state)
+                        continue;
+                    const mark = state.status === "ready"
+                        ? chalk.green("✓")
+                        : state.status === "error"
+                            ? chalk.red("✗")
+                            : chalk.yellow("…");
+                    const ports = buildServicePorts(resource, portPlan?.ingressHttp);
+                    const urlPart = ports.url ? ` → ${ports.url}` : "";
+                    showDetail(`${mark} ${resource.name}${urlPart}  ${state.status}${state.reason ? ` (${state.reason})` : ""}`, 6);
+                }
             }
         }
         else if (discovery.resources.length > 0) {