@getmonoceros/workbench 1.35.0 → 1.36.1

package/dist/bin.js

@@ -1166,6 +1166,7 @@ function makePalette(isTty2) {
     bold: (s) => wrap(s, ANSI_BOLD2),
     underline: (s) => wrap(s, ANSI_UNDERLINE2),
     cyan: (s) => wrap(s, ANSI_CYAN2),
+    green: (s) => wrap(s, ANSI_GREEN),
     dim: (s) => wrap(s, ANSI_GREY2),
     sectionLine: (label) => wrap(`\u25B8 ${label}`, ANSI_BOLD2, ANSI_UNDERLINE2)
   };
@@ -1173,7 +1174,7 @@ function makePalette(isTty2) {
 function colorsFor(stream) {
   return makePalette(stream.isTTY ?? false);
 }
-var ESC, ANSI_BOLD2, ANSI_UNDERLINE2, ANSI_CYAN2, ANSI_GREY2, ANSI_RESET2, ANSI_RE2, stderrPalette, bold2, underline2, cyan2, dim, sectionLine;
+var ESC, ANSI_BOLD2, ANSI_UNDERLINE2, ANSI_CYAN2, ANSI_GREEN, ANSI_GREY2, ANSI_RESET2, ANSI_RE2, stderrPalette, bold2, underline2, cyan2, green, dim, sectionLine;
 var init_format = __esm({
   "src/util/format.ts"() {
     "use strict";
@@ -1181,6 +1182,7 @@ var init_format = __esm({
     ANSI_BOLD2 = `${ESC}1m`;
     ANSI_UNDERLINE2 = `${ESC}4m`;
     ANSI_CYAN2 = `${ESC}36m`;
+    ANSI_GREEN = `${ESC}32m`;
     ANSI_GREY2 = `${ESC}90m`;
     ANSI_RESET2 = `${ESC}0m`;
     ANSI_RE2 = /\x1b\[[0-9;]*m/g;
@@ -1188,6 +1190,7 @@ var init_format = __esm({
     bold2 = stderrPalette.bold;
     underline2 = stderrPalette.underline;
     cyan2 = stderrPalette.cyan;
+    green = stderrPalette.green;
     dim = stderrPalette.dim;
     sectionLine = stderrPalette.sectionLine;
   }
@@ -2255,6 +2258,14 @@ function runtimeSupportsEntrypointSshd(version) {
   if (!version) return false;
   return compareRuntimeVersions(version, MIN_RUNTIME_FOR_ENTRYPOINT_SSHD) >= 0;
 }
+function runtimeSupportsAppRestart(version) {
+  if (!version) return false;
+  return compareRuntimeVersions(version, MIN_RUNTIME_FOR_APP_RESTART) >= 0;
+}
+function runtimeSupportsAppStatus(version) {
+  if (!version) return false;
+  return compareRuntimeVersions(version, MIN_RUNTIME_FOR_APP_STATUS) >= 0;
+}
 function descriptorOptionDefaults(options) {
   const out = {};
   for (const [key, spec] of Object.entries(options)) {
@@ -2387,7 +2398,7 @@ function deriveServiceName(image) {
   const noTag = lastSegment.split("@")[0].split(":")[0];
   return noTag.toLowerCase().replace(/[^a-z0-9_-]/g, "-");
 }
-var DEFAULT_BASE_IMAGE, override, BASE_IMAGE, RUNTIME_IMAGE_REPO, DEFAULT_RUNTIME_VERSION, MIN_RUNTIME_FOR_SSH_ATTACH, MIN_RUNTIME_FOR_HOST_KEY_PINNING, MIN_RUNTIME_FOR_ENTRYPOINT_SSHD, MIN_RUNTIME_FOR_BROWSER_BRIDGE, DESCRIPTORS, BUILTIN_LANGUAGES, LANGUAGE_CATALOG, LANGUAGE_SPEC_RE, SERVICE_CATALOG, DEFERRED_SERVICE_PROFILE;
+var DEFAULT_BASE_IMAGE, override, BASE_IMAGE, RUNTIME_IMAGE_REPO, DEFAULT_RUNTIME_VERSION, MIN_RUNTIME_FOR_SSH_ATTACH, MIN_RUNTIME_FOR_HOST_KEY_PINNING, MIN_RUNTIME_FOR_ENTRYPOINT_SSHD, MIN_RUNTIME_FOR_BROWSER_BRIDGE, MIN_RUNTIME_FOR_APP_RESTART, MIN_RUNTIME_FOR_APP_STATUS, DESCRIPTORS, BUILTIN_LANGUAGES, LANGUAGE_CATALOG, LANGUAGE_SPEC_RE, SERVICE_CATALOG, DEFERRED_SERVICE_PROFILE;
 var init_catalog = __esm({
   "src/create/catalog.ts"() {
     "use strict";
@@ -2396,7 +2407,7 @@ var init_catalog = __esm({
     override = process.env.MONOCEROS_BASE_IMAGE_OVERRIDE?.trim();
     BASE_IMAGE = override && override.length > 0 ? override : DEFAULT_BASE_IMAGE;
     RUNTIME_IMAGE_REPO = "ghcr.io/getmonoceros/monoceros-runtime";
-    DEFAULT_RUNTIME_VERSION = true ? "1.5.0" : readFileSync3(
+    DEFAULT_RUNTIME_VERSION = true ? "1.6.0" : readFileSync3(
       fileURLToPath2(
         new URL("../../../../images/runtime/VERSION", import.meta.url)
       ),
@@ -2406,6 +2417,8 @@ var init_catalog = __esm({
     MIN_RUNTIME_FOR_HOST_KEY_PINNING = "1.3.5";
     MIN_RUNTIME_FOR_ENTRYPOINT_SSHD = "1.3.6";
     MIN_RUNTIME_FOR_BROWSER_BRIDGE = "1.3.3";
+    MIN_RUNTIME_FOR_APP_RESTART = "1.6.0";
+    MIN_RUNTIME_FOR_APP_STATUS = "1.6.0";
     DESCRIPTORS = loadDescriptorCatalogSync();
     BUILTIN_LANGUAGES = new Set(
       [...DESCRIPTORS.values()].filter((c) => c.category === "language" && c.descriptor.language?.builtin).map(descriptorSelector)
@@ -5386,8 +5399,8 @@ function removeRepoFromDoc(doc, urlOrPath) {
     if (!isMap2(item)) return false;
     const url = item.get("url");
     if (url === urlOrPath) return true;
-    const path32 = item.get("path");
-    const effectivePath = typeof path32 === "string" ? path32 : typeof url === "string" ? deriveRepoName(url) : void 0;
+    const path33 = item.get("path");
+    const effectivePath = typeof path33 === "string" ? path33 : typeof url === "string" ? deriveRepoName(url) : void 0;
     return effectivePath === urlOrPath;
   });
   if (idx < 0) return false;
@@ -5531,7 +5544,7 @@ async function runAddRepo(input) {
       "Missing repo URL. Usage: monoceros add-repo <containername> <url>."
     );
   }
-  const path32 = (input.path ?? deriveRepoName(url)).trim();
+  const path33 = (input.path ?? deriveRepoName(url)).trim();
   const hasName = typeof input.gitName === "string" && input.gitName.trim().length > 0;
   const hasEmail = typeof input.gitEmail === "string" && input.gitEmail.trim().length > 0;
   if (hasName !== hasEmail) {
@@ -5568,7 +5581,7 @@ async function runAddRepo(input) {
   const providerToWrite = !canonical && explicitProvider ? explicitProvider : void 0;
   const entry2 = {
     url,
-    path: path32,
+    path: path33,
     ...hasName && hasEmail ? {
       gitUser: {
         name: input.gitName.trim(),
@@ -6536,16 +6549,66 @@ var init_state = __esm({
   }
 });
 
+// src/devcontainer/app-control.ts
+import { promises as fs12 } from "fs";
+import path15 from "path";
+function findRunningContainer(name, opts = {}) {
+  return findRunningContainerByLocalFolder(containerDir(name), {
+    ...opts.docker ? { docker: opts.docker } : {}
+  });
+}
+async function runAppCtl(name, ctlArgs2, opts = {}) {
+  const id = await findRunningContainer(name, opts);
+  if (!id) {
+    throw new Error(
+      `Container "${name}" is not running. Run \`monoceros start ${name}\` first.`
+    );
+  }
+  const exec = opts.exec ?? realContainerExec;
+  const result = await exec(id, ["monoceros-ctl", ...ctlArgs2]);
+  return result.exitCode;
+}
+async function hasWantedApps(name, home) {
+  const runRoot = path15.join(containerDir(name, home), ".monoceros", "run");
+  async function anyPid(dir) {
+    let entries;
+    try {
+      entries = await fs12.readdir(dir, { withFileTypes: true });
+    } catch {
+      return false;
+    }
+    for (const e of entries) {
+      if (e.isDirectory()) {
+        if (await anyPid(path15.join(dir, e.name))) return true;
+      } else if (e.isFile() && e.name.endsWith(".pid")) {
+        return true;
+      }
+    }
+    return false;
+  }
+  return anyPid(runRoot);
+}
+function ctlArgs(sub, app, target, extra = []) {
+  return [sub, app, ...target ? ["--target", target] : [], ...extra];
+}
+var init_app_control = __esm({
+  "src/devcontainer/app-control.ts"() {
+    "use strict";
+    init_paths();
+    init_locate_running();
+  }
+});
+
 // src/devcontainer/browser-bridge.ts
 import { spawn as spawn5 } from "child_process";
 import { existsSync as existsSync9, promises as fsp4, readFileSync as readFileSync5 } from "fs";
 import http from "http";
-import path15 from "path";
+import path16 from "path";
 function relayDir(root) {
-  return path15.join(root, RELAY_DIRNAME);
+  return path16.join(root, RELAY_DIRNAME);
 }
 function relayUrlFile(root) {
-  return path15.join(relayDir(root), "url");
+  return path16.join(relayDir(root), "url");
 }
 function parseCallbackTarget(authUrl) {
   try {
@@ -6599,7 +6662,7 @@ function openInBrowser(url) {
 }
 async function startBrowserBridge(opts) {
   const dir = relayDir(opts.root);
-  const relayScript = path15.join(dir, "xdg-open");
+  const relayScript = path16.join(dir, "xdg-open");
   const urlFile = relayUrlFile(opts.root);
   await fsp4.mkdir(dir, { recursive: true });
   await fsp4.rm(urlFile, { force: true });
@@ -6796,7 +6859,7 @@ var init_runtime_pull_hint = __esm({
 import { spawn as spawn6 } from "child_process";
 import { readFileSync as readFileSync6 } from "fs";
 import { createRequire } from "module";
-import path16 from "path";
+import path17 from "path";
 function devcontainerCliPath() {
   if (cachedBinaryPath) return cachedBinaryPath;
   const pkgJsonPath = require_.resolve("@devcontainers/cli/package.json");
@@ -6805,7 +6868,7 @@ function devcontainerCliPath() {
   if (!binEntry) {
     throw new Error("Could not resolve @devcontainers/cli bin entry.");
   }
-  cachedBinaryPath = path16.resolve(path16.dirname(pkgJsonPath), binEntry);
+  cachedBinaryPath = path17.resolve(path17.dirname(pkgJsonPath), binEntry);
   return cachedBinaryPath;
 }
 var require_, cachedBinaryPath, spawnDevcontainer;
@@ -6880,7 +6943,7 @@ var init_cli = __esm({
 // src/devcontainer/compose.ts
 import { spawn as spawn7 } from "child_process";
 import { existsSync as existsSync10 } from "fs";
-import path17 from "path";
+import path18 from "path";
 import { Writable } from "stream";
 import { consola as consola10 } from "consola";
 function spawnDockerComposeTo(opts) {
@@ -6949,21 +7012,21 @@ async function cleanupDockerObjects(opts) {
   return { exitCode: rmExit, removedIds: ids };
 }
 function composeProjectName(root) {
-  return `${path17.basename(root)}_devcontainer`;
+  return `${path18.basename(root)}_devcontainer`;
 }
 function assertDevcontainer(root) {
-  if (!existsSync10(path17.join(root, ".devcontainer"))) {
+  if (!existsSync10(path18.join(root, ".devcontainer"))) {
     throw new Error(
       `No .devcontainer/ at ${root}. Run \`monoceros apply <name>\` first.`
     );
   }
 }
 function isComposeMode(root) {
-  return existsSync10(path17.join(root, ".devcontainer", "compose.yaml"));
+  return existsSync10(path18.join(root, ".devcontainer", "compose.yaml"));
 }
 function resolveCompose(root) {
   assertDevcontainer(root);
-  const composeFile = path17.join(root, ".devcontainer", "compose.yaml");
+  const composeFile = path18.join(root, ".devcontainer", "compose.yaml");
   if (!existsSync10(composeFile)) {
     throw new Error(
       `No compose.yaml at ${composeFile}. \`monoceros logs\` tails compose service logs, which require services configured via \`monoceros add-service <name> <svc>\`. For a bare container, use \`monoceros shell <name>\` or read logs/<app>.log.`
@@ -7156,23 +7219,13 @@ function runStop(opts) {
   }
   return stopImageContainer(opts);
 }
-function runStatus(opts) {
-  assertDevcontainer(opts.root);
-  if (isComposeMode(opts.root)) {
-    return runComposeAction(
-      (service) => ["ps", ...service ? [service] : []],
-      opts
-    );
-  }
-  return statusImageContainer(opts);
-}
 function imageContainerFilter(root) {
   return `label=devcontainer.local_folder=${root}`;
 }
 async function stopImageContainer(opts) {
   const exec = opts.dockerExec ?? spawnDocker;
   const logger = opts.logger ?? { info: (msg) => consola10.info(msg) };
-  const name = path17.basename(opts.root);
+  const name = path18.basename(opts.root);
   const ps = await exec([
     "ps",
     "-q",
@@ -7190,29 +7243,6 @@ async function stopImageContainer(opts) {
   if (res.exitCode === 0) logger.info(`Stopped '${name}'.`);
   return res.exitCode;
 }
-async function statusImageContainer(opts) {
-  const exec = opts.dockerExec ?? spawnDocker;
-  const logger = opts.logger ?? { info: (msg) => consola10.info(msg) };
-  const name = path17.basename(opts.root);
-  const res = await exec([
-    "ps",
-    "-a",
-    "--filter",
-    imageContainerFilter(opts.root)
-  ]);
-  const rows = res.stdout.split("\n").filter((l) => l.trim().length > 0);
-  if (rows.length <= 1) {
-    logger.info(
-      `Container '${name}' does not exist. Run \`monoceros apply ${name}\`.`
-    );
-    return 0;
-  }
-  process.stdout.write(
-    res.stdout.endsWith("\n") ? res.stdout : `${res.stdout}
-`
-  );
-  return res.exitCode;
-}
 function runLogs(opts) {
   const follow = opts.follow ?? true;
   return runComposeAction(
@@ -7280,9 +7310,9 @@ import {
   readFileSync as readFileSync7,
   writeFileSync
 } from "fs";
-import path18 from "path";
+import path19 from "path";
 function bridgePidFile(root) {
-  return path18.join(relayDir(root), "daemon.pid");
+  return path19.join(relayDir(root), "daemon.pid");
 }
 function pidAlive(pid) {
   try {
@@ -7386,7 +7416,7 @@ var init_bridge_daemon = __esm({
 
 // src/apply/apply-log.ts
 import { createWriteStream, mkdirSync as mkdirSync2 } from "fs";
-import path19 from "path";
+import path20 from "path";
 import { Writable as Writable2 } from "stream";
 function safeIsoStamp(d) {
   return d.toISOString().replace(/[:.]/g, "-");
@@ -7396,7 +7426,7 @@ function createApplyLog(opts) {
   const dir = containerLogsDir(opts.name, opts.home);
   mkdirSync2(dir, { recursive: true });
   const file = `apply-${opts.name}-${safeIsoStamp(now)}.log`;
-  const fullPath = path19.join(dir, file);
+  const fullPath = path20.join(dir, file);
   const stream = createWriteStream(fullPath, { flags: "w" });
   const header = [
     `# monoceros apply log`,
@@ -7733,9 +7763,9 @@ var init_images = __esm({
 
 // src/config/machine-state.ts
 import { promises as fsp6, readFileSync as readFileSync8 } from "fs";
-import path20 from "path";
+import path21 from "path";
 function machineStatePath(home = monocerosHome()) {
-  return path20.join(home, ".machine-state.json");
+  return path21.join(home, ".machine-state.json");
 }
 async function readMachineState(home = monocerosHome()) {
   try {
@@ -7878,8 +7908,8 @@ var init_docker_mode = __esm({
 
 // src/devcontainer/identity.ts
 import { spawn as spawn10 } from "child_process";
-import { promises as fs12 } from "fs";
-import path21 from "path";
+import { promises as fs13 } from "fs";
+import path22 from "path";
 import { consola as consola11 } from "consola";
 async function resolveIdentityWithPrompt(options = {}) {
   const spawnFn = options.spawn ?? realGitConfigGet;
@@ -7935,8 +7965,8 @@ async function resolveIdentityWithPrompt(options = {}) {
   };
 }
 async function collectGitIdentity(devContainerRoot, options = {}) {
-  const gitconfigDir = path21.join(devContainerRoot, ".monoceros");
-  const gitconfigPath = path21.join(gitconfigDir, "gitconfig");
+  const gitconfigDir = path22.join(devContainerRoot, ".monoceros");
+  const gitconfigPath = path22.join(gitconfigDir, "gitconfig");
   const logger = options.logger ?? { info: () => {
   }, warn: () => {
   } };
@@ -7949,8 +7979,8 @@ async function collectGitIdentity(devContainerRoot, options = {}) {
   const lines = ["[user]"];
   if (resolved.name !== void 0) lines.push(`	name = ${resolved.name}`);
   if (resolved.email !== void 0) lines.push(`	email = ${resolved.email}`);
-  await fs12.mkdir(gitconfigDir, { recursive: true });
-  await fs12.writeFile(gitconfigPath, lines.join("\n") + "\n");
+  await fs13.mkdir(gitconfigDir, { recursive: true });
+  await fs13.writeFile(gitconfigPath, lines.join("\n") + "\n");
   return {
     ...resolved.name !== void 0 ? { name: resolved.name } : {},
     ...resolved.email !== void 0 ? { email: resolved.email } : {},
@@ -7993,7 +8023,7 @@ async function readKeyFromHost(spawnFn, key, logger) {
 }
 async function readExistingGitconfig(filePath) {
   try {
-    const content = await fs12.readFile(filePath, "utf8");
+    const content = await fs13.readFile(filePath, "utf8");
     const result = {};
     const nameMatch = /^\s*name\s*=\s*(.+?)\s*$/m.exec(content);
     const emailMatch = /^\s*email\s*=\s*(.+?)\s*$/m.exec(content);
@@ -8070,7 +8100,7 @@ var init_identity = __esm({
 });
 
 // src/apply/index.ts
-import { existsSync as existsSync12, promises as fs13 } from "fs";
+import { existsSync as existsSync12, promises as fs14 } from "fs";
 import { consola as consola12 } from "consola";
 async function runApply(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -8210,7 +8240,7 @@ Fix the value in the env file (or the yml).`
   if (dockerMode === "rootless") {
     throw new Error(formatRootlessNotSupportedError());
   }
-  await fs13.mkdir(targetDir, { recursive: true });
+  await fs14.mkdir(targetDir, { recursive: true });
   await writeScaffold(createOpts, targetDir, { dockerMode });
   await writeStateFile(
     targetDir,
@@ -8382,6 +8412,18 @@ Fix the value in the env file (or the yml).`
           );
         }
       }
+      if (runtimeSupportsAppRestart(createOpts.runtimeVersion) && await hasWantedApps(opts.name, home)) {
+        progressOut.write(`
+  ${dim("restoring apps that were running\u2026")}
+`);
+        try {
+          await runAppCtl(opts.name, ["reconcile"]);
+        } catch (err) {
+          (logger.warn ?? logger.info)(
+            `Restoring running apps skipped: ${err instanceof Error ? err.message : String(err)}. Bring them back with \`monoceros start ${opts.name} <app>\`.`
+          );
+        }
+      }
       const summaryLines = buildApplySummary(createOpts);
       if (summaryLines.length > 0) {
         const formatted = formatApplySummary(summaryLines);
@@ -8432,7 +8474,7 @@ ${stripAnsi(formatted)}
 }
 async function assertSafeTargetDir(targetDir, expectedOrigin) {
   if (!existsSync12(targetDir)) return;
-  const entries = await fs13.readdir(targetDir);
+  const entries = await fs14.readdir(targetDir);
   if (entries.length === 0) return;
   const state = await readStateFile(targetDir);
   if (state) {
@@ -8502,7 +8544,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
   }
   if (wantContainer) {
     try {
-      const text = await fs13.readFile(ymlPath, "utf8");
+      const text = await fs14.readFile(ymlPath, "utf8");
       const parsed = parseConfig(text, ymlPath);
       const changed = setContainerGitUserInDoc(parsed.doc, {
         name: prompted.name,
@@ -8510,7 +8552,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
       });
       if (changed) {
         const out = stringifyConfig(parsed.doc);
-        await fs13.writeFile(ymlPath, out, "utf8");
+        await fs14.writeFile(ymlPath, out, "utf8");
         logger.info(
           `Saved identity in this container \u2014 wrote git.user into ${prettyPath(ymlPath)}.`
         );
@@ -8533,6 +8575,7 @@ var init_apply = __esm({
     init_state();
     init_transform();
     init_catalog();
+    init_app_control();
     init_bridge_daemon();
     init_ssh_attach();
     init_scaffold();
@@ -8560,7 +8603,7 @@ var init_apply = __esm({
 
 // src/devcontainer/shell.ts
 import { existsSync as existsSync13 } from "fs";
-import path22 from "path";
+import path23 from "path";
 async function runShell(opts) {
   assertContainerExists(opts.root);
   const spawnFn = opts.spawn ?? spawnDevcontainer;
@@ -8570,7 +8613,7 @@ async function runShell(opts) {
     { quiet: true }
   );
   if (upCode !== 0) return upCode;
-  const name = opts.name ?? path22.basename(opts.root);
+  const name = opts.name ?? path23.basename(opts.root);
   const isTty2 = opts.isTty ?? process.stdout.isTTY;
   const bridge = isTty2 ? await startBrowserBridge({ name, root: opts.root, spawn: spawnFn }) : null;
   try {
@@ -8594,7 +8637,7 @@ async function runShell(opts) {
   }
 }
 function assertContainerExists(root) {
-  if (!existsSync13(path22.join(root, ".devcontainer"))) {
+  if (!existsSync13(path23.join(root, ".devcontainer"))) {
     throw new Error(
       `No .devcontainer/ at ${root}. Run \`monoceros apply <name>\` first.`
     );
@@ -8611,12 +8654,12 @@ var init_shell = __esm({
 // src/open/index.ts
 import { spawn as spawn11 } from "child_process";
 import { accessSync, constants, existsSync as existsSync14 } from "fs";
-import path23 from "path";
+import path24 from "path";
 import { consola as consola13 } from "consola";
 function resolveOnPath(bin) {
-  const dirs = (process.env.PATH ?? "").split(path23.delimiter).filter(Boolean);
+  const dirs = (process.env.PATH ?? "").split(path24.delimiter).filter(Boolean);
   for (const dir of dirs) {
-    const candidate = path23.join(dir, bin);
+    const candidate = path24.join(dir, bin);
     try {
       accessSync(candidate, constants.X_OK);
       return candidate;
@@ -8729,7 +8772,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.35.0" : "dev";
+    CLI_VERSION = true ? "1.36.1" : "dev";
   }
 });
 
@@ -8963,10 +9006,10 @@ var init_bridge = __esm({
 });
 
 // src/config/launch-config.ts
-import { promises as fs14 } from "fs";
-import path24 from "path";
+import { promises as fs15 } from "fs";
+import path25 from "path";
 function launchConfigPath(name, appRel, home) {
-  return path24.join(
+  return path25.join(
     containerDir(name, home),
     "projects",
     appRel,
@@ -9016,7 +9059,7 @@ async function readLaunchConfig(name, appRel, home) {
   const file = launchConfigPath(name, appRel, home);
   let content;
   try {
-    content = await fs14.readFile(file, "utf8");
+    content = await fs15.readFile(file, "utf8");
   } catch {
     return void 0;
   }
@@ -9053,12 +9096,12 @@ function resolveTarget(config, targetName, appRel) {
   );
 }
 async function listApps(name, home) {
-  const projectsRoot = path24.join(containerDir(name, home), "projects");
+  const projectsRoot = path25.join(containerDir(name, home), "projects");
   const out = [];
   async function walk(at, rel, depth) {
     let entries;
     try {
-      entries = await fs14.readdir(at, { withFileTypes: true });
+      entries = await fs15.readdir(at, { withFileTypes: true });
     } catch {
       return;
     }
@@ -9067,7 +9110,7 @@ async function listApps(name, home) {
     );
     if (hasLaunch) {
       try {
-        await fs14.access(path24.join(at, LAUNCH_DIRNAME, LAUNCH_FILENAME));
+        await fs15.access(path25.join(at, LAUNCH_DIRNAME, LAUNCH_FILENAME));
         if (rel) out.push(rel);
       } catch {
       }
@@ -9077,7 +9120,7 @@ async function listApps(name, home) {
       if (!e.isDirectory()) continue;
       if (e.name.startsWith(".")) continue;
       await walk(
-        path24.join(at, e.name),
+        path25.join(at, e.name),
         rel ? `${rel}/${e.name}` : e.name,
         depth + 1
       );
@@ -9098,8 +9141,8 @@ var init_launch_config = __esm({
 });
 
 // src/completion/resolve.ts
-import { existsSync as existsSync15, promises as fs15 } from "fs";
-import path25 from "path";
+import { existsSync as existsSync15, promises as fs16 } from "fs";
+import path26 from "path";
 async function resolveCompletions(line, point, opts = {}) {
   const { prev, current } = parseCompletionLine(line, point);
   const ctx = { prev, current, opts };
@@ -9248,9 +9291,9 @@ function filterPrefix(values, fragment) {
 }
 async function listContainerNames(ctx) {
   const home = ctx.opts.monocerosHome ?? monocerosHome();
-  const dir = path25.join(home, "container-configs");
+  const dir = path26.join(home, "container-configs");
   if (!existsSync15(dir)) return [];
-  const entries = await fs15.readdir(dir);
+  const entries = await fs16.readdir(dir);
   return entries.filter((e) => e.endsWith(".yml")).map((e) => e.slice(0, -".yml".length)).sort();
 }
 function containerNameFromCtx(ctx) {
@@ -9281,6 +9324,22 @@ async function listAppCandidates(ctx) {
     return [];
   }
 }
+async function listAppOrServiceCandidates(ctx) {
+  const name = containerNameFromCtx(ctx);
+  if (!name) return [];
+  const apps = await listApps(name, ctx.opts.monocerosHome).catch(() => []);
+  let services = [];
+  try {
+    const parsed = await readConfig(
+      containerConfigPath(name, ctx.opts.monocerosHome)
+    );
+    services = solutionConfigToCreateOptions(parsed.config).services.map(
+      (s) => s.name
+    );
+  } catch {
+  }
+  return [.../* @__PURE__ */ new Set([...apps, ...services])].sort();
+}
 async function listTargetCandidates(ctx) {
   const name = containerNameFromCtx(ctx);
   const app = positionalFromCtx(ctx, 1);
@@ -9297,7 +9356,7 @@ async function collectDirs(dir, maxDepth) {
   async function walk(at, rel, depth) {
     let entries;
     try {
-      entries = await fs15.readdir(at, { withFileTypes: true });
+      entries = await fs16.readdir(at, { withFileTypes: true });
     } catch {
       return;
     }
@@ -9308,7 +9367,7 @@ async function collectDirs(dir, maxDepth) {
       const childRel = rel ? `${rel}/${e.name}` : e.name;
       out.push(childRel);
       if (depth + 1 < maxDepth) {
-        await walk(path25.join(at, e.name), childRel, depth + 1);
+        await walk(path26.join(at, e.name), childRel, depth + 1);
       }
     }
   }
@@ -9316,9 +9375,9 @@ async function collectDirs(dir, maxDepth) {
   return out;
 }
 async function listContainerWorkspaceDirs(home, name) {
-  const root = path25.join(home, "container", name);
+  const root = path26.join(home, "container", name);
   const top = await collectDirs(root, 1);
-  const projects = (await collectDirs(path25.join(root, "projects"), PROJECTS_DIR_MAX_DEPTH)).map((p) => `projects/${p}`);
+  const projects = (await collectDirs(path26.join(root, "projects"), PROJECTS_DIR_MAX_DEPTH)).map((p) => `projects/${p}`);
   return [.../* @__PURE__ */ new Set([...top, ...projects])].sort();
 }
 async function listRunInDirs(ctx) {
@@ -9394,6 +9453,8 @@ var init_resolve = __esm({
   "src/completion/resolve.ts"() {
     "use strict";
     init_paths();
+    init_io();
+    init_transform();
     init_launch_config();
     init_components();
     init_manifest();
@@ -9500,7 +9561,9 @@ var init_resolve = __esm({
           "--target": { type: "value", values: (ctx) => listTargetCandidates(ctx) }
         }
       },
-      status: { positionals: [containerName] },
+      status: {
+        positionals: [containerName, (ctx) => listAppOrServiceCandidates(ctx)]
+      },
       "list-apps": { positionals: [containerName] },
       "add-language": {
         positionals: [containerName, () => listLanguageNames()]
@@ -10164,8 +10227,8 @@ var init_generator = __esm({
 });
 
 // src/init/index.ts
-import { existsSync as existsSync16, promises as fs16 } from "fs";
-import path26 from "path";
+import { existsSync as existsSync16, promises as fs17 } from "fs";
+import path27 from "path";
 import { consola as consola16 } from "consola";
 async function runInit(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -10184,7 +10247,7 @@ async function runInit(opts) {
       `Config already exists: ${dest}. Delete it manually before re-running \`monoceros init\` \u2014 this protects any hand-edits.`
     );
   }
-  const componentsRoot = opts.workbenchRoot ? path26.join(opts.workbenchRoot, "components") : componentsRootDir();
+  const componentsRoot = opts.workbenchRoot ? path27.join(opts.workbenchRoot, "components") : componentsRootDir();
   const catalog = await loadComponentCatalog(componentsRoot);
   if (catalog.size === 0) {
     throw new Error(
@@ -10250,9 +10313,9 @@ async function runInit(opts) {
   } else {
     text = generateComposedYml(opts.name, composed, lookup, repos, ports);
   }
-  await fs16.mkdir(containerConfigsDir(home), { recursive: true });
+  await fs17.mkdir(containerConfigsDir(home), { recursive: true });
   await ensureEnvGitignored(containerConfigsDir(home));
-  await fs16.writeFile(dest, text, "utf8");
+  await fs17.writeFile(dest, text, "utf8");
   const envPath = containerEnvPath(opts.name, home);
   const seedVars = {};
   for (const f of composed.features) {
@@ -10275,8 +10338,8 @@ async function runInit(opts) {
   }
   await ensureEnvVars(envPath, opts.name, seedVars);
   const documented = !anyComposed;
-  const ymlRel = path26.relative(home, dest);
-  const envRel = path26.relative(home, envPath);
+  const ymlRel = path27.relative(home, dest);
+  const envRel = path27.relative(home, envPath);
   if (documented) {
     logger.success(`Wrote documented default to ${ymlRel} and ${envRel}.`);
     logger.info(
@@ -10836,7 +10899,7 @@ var init_list_components = __esm({
 
 // src/commands/logs.ts
 import { spawn as spawn13 } from "child_process";
-import path27 from "path";
+import path28 from "path";
 import { defineCommand as defineCommand16 } from "citty";
 import { consola as consola20 } from "consola";
 function tailLogFile(file, follow) {
@@ -10891,7 +10954,7 @@ var init_logs = __esm({
             const cfg = await readLaunchConfig(args.name, app);
             if (cfg) {
               const t = resolveTarget(cfg, target, app);
-              const logFile = path27.join(
+              const logFile = path28.join(
                 containerLogsDir(args.name),
                 app,
                 `${t.name}.log`
@@ -11140,8 +11203,8 @@ var init_remove_feature = __esm({
 });
 
 // src/remove/index.ts
-import { existsSync as existsSync17, promises as fs17 } from "fs";
-import path28 from "path";
+import { existsSync as existsSync17, promises as fs18 } from "fs";
+import path29 from "path";
 import { consola as consola24 } from "consola";
 async function runRemove(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -11186,16 +11249,16 @@ async function runRemove(opts) {
   let backupPath = null;
   if (!opts.noBackup && (hasYml || hasContainer)) {
     const ts = (opts.now ?? /* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-    backupPath = path28.join(home, "container-backups", `${opts.name}-${ts}`);
-    await fs17.mkdir(backupPath, { recursive: true });
+    backupPath = path29.join(home, "container-backups", `${opts.name}-${ts}`);
+    await fs18.mkdir(backupPath, { recursive: true });
     if (hasYml) {
-      await fs17.copyFile(ymlPath, path28.join(backupPath, `${opts.name}.yml`));
+      await fs18.copyFile(ymlPath, path29.join(backupPath, `${opts.name}.yml`));
     }
     if (hasEnv) {
-      await fs17.copyFile(envPath, path28.join(backupPath, `${opts.name}.env`));
+      await fs18.copyFile(envPath, path29.join(backupPath, `${opts.name}.env`));
     }
     if (hasContainer) {
-      await fs17.cp(containerPath, path28.join(backupPath, "container"), {
+      await fs18.cp(containerPath, path29.join(backupPath, "container"), {
         recursive: true
       });
     }
@@ -11205,14 +11268,14 @@ async function runRemove(opts) {
     await stopBridgeDaemon(containerPath);
   }
   if (hasYml) {
-    await fs17.rm(ymlPath, { force: true });
+    await fs18.rm(ymlPath, { force: true });
   }
   if (hasEnv) {
-    await fs17.rm(envPath, { force: true });
+    await fs18.rm(envPath, { force: true });
   }
   if (hasContainer) {
     try {
-      await fs17.rm(containerPath, { recursive: true, force: true });
+      await fs18.rm(containerPath, { recursive: true, force: true });
     } catch (err) {
       const code = err.code;
       if (code !== "EACCES" && code !== "EPERM") {
@@ -11234,7 +11297,7 @@ async function runRemove(opts) {
         "-delete"
       ]);
       try {
-        await fs17.rm(containerPath, { recursive: true, force: true });
+        await fs18.rm(containerPath, { recursive: true, force: true });
       } catch (err2) {
         const code2 = err2.code;
         throw new Error(
@@ -11369,8 +11432,8 @@ var init_remove2 = __esm({
 });
 
 // src/restore/index.ts
-import { existsSync as existsSync18, promises as fs18 } from "fs";
-import path29 from "path";
+import { existsSync as existsSync18, promises as fs19 } from "fs";
+import path30 from "path";
 import { consola as consola26 } from "consola";
 async function runRestore(opts) {
   const home = opts.monocerosHome ?? monocerosHome();
@@ -11378,15 +11441,15 @@ async function runRestore(opts) {
     info: (msg) => consola26.info(msg),
     success: (msg) => consola26.success(msg)
   };
-  const backup = path29.resolve(opts.backupPath);
+  const backup = path30.resolve(opts.backupPath);
   if (!existsSync18(backup)) {
     throw new Error(`Backup not found: ${backup}.`);
   }
-  const stat = await fs18.stat(backup);
+  const stat = await fs19.stat(backup);
   if (!stat.isDirectory()) {
     throw new Error(`Backup path is not a directory: ${backup}.`);
   }
-  const entries = await fs18.readdir(backup);
+  const entries = await fs19.readdir(backup);
   const ymlFiles = entries.filter((f) => f.endsWith(".yml"));
   if (ymlFiles.length === 0) {
     throw new Error(
@@ -11400,9 +11463,9 @@ async function runRestore(opts) {
   }
   const ymlFile = ymlFiles[0];
   const name = ymlFile.replace(/\.yml$/, "");
-  const containerInBackup = path29.join(backup, "container");
+  const containerInBackup = path30.join(backup, "container");
   const hasContainer = existsSync18(containerInBackup);
-  const envInBackup = path29.join(backup, `${name}.env`);
+  const envInBackup = path30.join(backup, `${name}.env`);
   const hasEnv = existsSync18(envInBackup);
   const destYml = containerConfigPath(name, home);
   const destContainer = containerDir(name, home);
@@ -11416,13 +11479,13 @@ async function runRestore(opts) {
       `Refusing to restore: ${destContainer} already exists. Remove the current container first (\`monoceros remove ${name}\`).`
     );
   }
-  await fs18.mkdir(containerConfigsDir(home), { recursive: true });
-  await fs18.copyFile(path29.join(backup, ymlFile), destYml);
+  await fs19.mkdir(containerConfigsDir(home), { recursive: true });
+  await fs19.copyFile(path30.join(backup, ymlFile), destYml);
   if (hasEnv) {
-    await fs18.copyFile(envInBackup, containerEnvPath(name, home));
+    await fs19.copyFile(envInBackup, containerEnvPath(name, home));
   }
   if (hasContainer) {
-    await fs18.cp(containerInBackup, destContainer, { recursive: true });
+    await fs19.cp(containerInBackup, destContainer, { recursive: true });
   }
   logger.success(`Restored '${name}' from ${prettyPath(backup)}.`);
   logger.info(
@@ -11728,14 +11791,14 @@ var init_remove_service = __esm({
 
 // src/devcontainer/claude-trust.ts
 import { existsSync as existsSync19, promises as fsp7 } from "fs";
-import path30 from "path";
+import path31 from "path";
 function resolveContainerCwd(name, cwd) {
   const workspace = `/workspaces/${name}`;
   if (!cwd) return workspace;
-  return path30.posix.isAbsolute(cwd) ? cwd : path30.posix.join(workspace, cwd);
+  return path31.posix.isAbsolute(cwd) ? cwd : path31.posix.join(workspace, cwd);
 }
 async function preApproveClaudeProject(opts) {
-  const file = path30.join(opts.root, "home", ".claude.json");
+  const file = path31.join(opts.root, "home", ".claude.json");
   if (!existsSync19(file)) return;
   try {
     const raw = await fsp7.readFile(file, "utf8");
@@ -11916,34 +11979,6 @@ var init_shell2 = __esm({
   }
 });
 
-// src/devcontainer/app-control.ts
-function findRunningContainer(name, opts = {}) {
-  return findRunningContainerByLocalFolder(containerDir(name), {
-    ...opts.docker ? { docker: opts.docker } : {}
-  });
-}
-async function runAppCtl(name, ctlArgs2, opts = {}) {
-  const id = await findRunningContainer(name, opts);
-  if (!id) {
-    throw new Error(
-      `Container "${name}" is not running. Run \`monoceros start ${name}\` first.`
-    );
-  }
-  const exec = opts.exec ?? realContainerExec;
-  const result = await exec(id, ["monoceros-ctl", ...ctlArgs2]);
-  return result.exitCode;
-}
-function ctlArgs(sub, app, target, extra = []) {
-  return [sub, app, ...target ? ["--target", target] : [], ...extra];
-}
-var init_app_control = __esm({
-  "src/devcontainer/app-control.ts"() {
-    "use strict";
-    init_paths();
-    init_locate_running();
-  }
-});
-
 // src/commands/start.ts
 import { defineCommand as defineCommand30 } from "citty";
 import { consola as consola35 } from "consola";
@@ -12076,20 +12111,360 @@ var init_start = __esm({
   }
 });
 
+// src/status/index.ts
+function shortFeatureName2(ref) {
+  const withoutTag = ref.replace(/:[^:/@]+$/, "");
+  const idx = withoutTag.lastIndexOf("/");
+  return idx >= 0 ? withoutTag.slice(idx + 1) : withoutTag;
+}
+function cols(line) {
+  return line.split("	");
+}
+function nonEmptyLines(s) {
+  return s.split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
+}
+async function gatherStatus(name, opts = {}) {
+  const docker = opts.docker ?? realDockerLookup;
+  const root = containerDir(name, opts.home);
+  let runtimeVersion;
+  let languages = [];
+  let features = [];
+  let declaredServices = [];
+  let declaredPorts = [];
+  let configured = false;
+  try {
+    const parsed = await readConfig(containerConfigPath(name, opts.home));
+    const createOpts = solutionConfigToCreateOptions(parsed.config);
+    configured = true;
+    runtimeVersion = createOpts.runtimeVersion;
+    languages = createOpts.languages;
+    features = Object.keys(createOpts.features ?? {}).map(shortFeatureName2);
+    declaredServices = createOpts.services.map((s) => ({
+      name: s.name,
+      ...typeof s.port === "number" ? { port: s.port } : {}
+    }));
+    declaredPorts = createOpts.ports ?? [];
+  } catch {
+  }
+  let container = {
+    exists: false,
+    running: false,
+    status: "",
+    dockerName: ""
+  };
+  let containerId = "";
+  let composeProject = "";
+  const cps = await docker([
+    "ps",
+    "-a",
+    "--no-trunc",
+    "--filter",
+    `label=devcontainer.local_folder=${root}`,
+    "--format",
+    '{{.ID}}	{{.State}}	{{.Status}}	{{.Names}}	{{.Label "com.docker.compose.project"}}'
+  ]);
+  const row2 = nonEmptyLines(cps.stdout)[0];
+  if (row2) {
+    const [id, state, status, names, project] = cols(row2);
+    containerId = id ?? "";
+    composeProject = project ?? "";
+    container = {
+      exists: true,
+      running: state === "running",
+      status: status ?? "",
+      dockerName: names ?? ""
+    };
+  }
+  const services = [];
+  if (declaredServices.length > 0) {
+    const live = /* @__PURE__ */ new Map();
+    if (composeProject) {
+      const sps = await docker([
+        "ps",
+        "-a",
+        "--filter",
+        `label=com.docker.compose.project=${composeProject}`,
+        "--format",
+        '{{.Label "com.docker.compose.service"}}	{{.State}}	{{.Status}}'
+      ]);
+      for (const l of nonEmptyLines(sps.stdout)) {
+        const [svc, state, status] = cols(l);
+        if (svc)
+          live.set(svc, { running: state === "running", status: status ?? "" });
+      }
+    }
+    for (const s of declaredServices) {
+      const m = live.get(s.name);
+      services.push({
+        name: s.name,
+        running: m?.running ?? false,
+        status: m?.status ?? "not created",
+        ...typeof s.port === "number" ? { port: s.port } : {}
+      });
+    }
+  }
+  const apps = [];
+  for (const app of await listApps(name, opts.home)) {
+    const cfg = await readLaunchConfig(name, app, opts.home);
+    if (!cfg) continue;
+    for (const t of cfg.configurations) {
+      apps.push({
+        app,
+        target: t.name,
+        port: typeof t.port === "number" ? t.port : null,
+        default: t.default === true,
+        running: void 0,
+        pid: null
+      });
+    }
+  }
+  const appsSupported = runtimeSupportsAppStatus(runtimeVersion);
+  let appStateKnown = container.running && appsSupported && containerId !== "";
+  let appStateNote;
+  if (appStateKnown) {
+    const res = await docker([
+      "exec",
+      containerId,
+      "monoceros-ctl",
+      "list",
+      "--json"
+    ]);
+    if (res.exitCode === 0) {
+      const byKey = /* @__PURE__ */ new Map();
+      for (const l of nonEmptyLines(res.stdout)) {
+        try {
+          const o = JSON.parse(l);
+          byKey.set(`${o.app}\0${o.target}`, {
+            running: !!o.running,
+            pid: o.pid ?? null
+          });
+        } catch {
+        }
+      }
+      for (const a of apps) {
+        const o = byKey.get(`${a.app}\0${a.target}`);
+        if (o) {
+          a.running = o.running;
+          a.pid = o.pid;
+        } else {
+          a.running = false;
+        }
+      }
+    } else {
+      appStateKnown = false;
+      appStateNote = `could not read run state from the runner - rebuild the runtime image, then \`monoceros upgrade ${name}\``;
+    }
+  }
+  if (apps.length > 0 && !appStateKnown && !appStateNote) {
+    appStateNote = !container.running ? `start the container to see run state (\`monoceros start ${name}\`)` : `run state needs runtime 1.6.0+ (this one: ${runtimeVersion ?? "unpinned"})`;
+  }
+  let hostPort = 80;
+  try {
+    hostPort = proxyHostPort(
+      await readMonocerosConfig({
+        ...opts.home ? { monocerosHome: opts.home } : {}
+      })
+    );
+  } catch {
+  }
+  const ports = proxyUrlsFor(name, declaredPorts, hostPort);
+  return {
+    name,
+    configured,
+    container,
+    services,
+    apps,
+    appStateKnown,
+    ...appStateNote ? { appStateNote } : {},
+    ports,
+    builtIn: { languages, features }
+  };
+}
+function row(p, marker, name, detail, pad, indent = 2) {
+  const gap = Math.max(2, pad - name.length + 2);
+  return `${" ".repeat(indent)}${marker} ${p.cyan(name)}${" ".repeat(gap)}${detail}`;
+}
+function liveMarker(p, running) {
+  if (running === void 0) return " ";
+  return running ? p.green("\u2713") : p.dim("\xB7");
+}
+function renderContainer(p, m) {
+  const out = [p.sectionLine(m.name)];
+  if (!m.container.exists) {
+    out.push(
+      row(
+        p,
+        p.dim("\xB7"),
+        "(not created)",
+        p.dim(`run \`monoceros apply ${m.name}\``),
+        14
+      )
+    );
+    return out;
+  }
+  const detail = m.container.running ? p.dim(m.container.status || "running") : p.dim(m.container.status || "stopped");
+  out.push(
+    row(
+      p,
+      liveMarker(p, m.container.running),
+      m.container.dockerName,
+      detail,
+      14
+    )
+  );
+  return out;
+}
+function renderServices(p, m) {
+  if (m.services.length === 0) return [];
+  const pad = Math.max(...m.services.map((s) => s.name.length));
+  const out = ["", p.sectionLine("Services")];
+  for (const s of m.services) {
+    const detail = s.running ? p.dim(typeof s.port === "number" ? `running    :${s.port}` : "running") : p.dim(s.status || "stopped");
+    out.push(row(p, liveMarker(p, s.running), s.name, detail, pad));
+  }
+  return out;
+}
+function appTargetDetail(p, name, t) {
+  const bits = [];
+  if (t.running === true) {
+    bits.push(
+      t.port !== null ? p.dim(`http://${name}-${t.port}.localhost`) : p.dim("running")
+    );
+    if (t.pid !== null) bits.push(p.dim(`pid ${t.pid}`));
+  } else if (t.running === false) {
+    bits.push(p.dim("stopped"));
+  }
+  if (t.default) bits.push(p.dim("(default)"));
+  return bits.join("    ");
+}
+function renderApps(p, m) {
+  if (m.apps.length === 0) return [];
+  const out = ["", p.sectionLine("Apps")];
+  if (m.appStateNote) out.push(`  ${p.dim(m.appStateNote)}`);
+  const byApp = /* @__PURE__ */ new Map();
+  for (const a of m.apps) {
+    const list = byApp.get(a.app) ?? [];
+    list.push(a);
+    byApp.set(a.app, list);
+  }
+  for (const [app, targets] of byApp) {
+    out.push(`  ${p.cyan(app)}`);
+    const pad = Math.max(...targets.map((t) => t.target.length));
+    for (const t of targets) {
+      out.push(
+        row(
+          p,
+          liveMarker(p, t.running),
+          t.target,
+          appTargetDetail(p, m.name, t),
+          pad,
+          4
+        )
+      );
+    }
+  }
+  return out;
+}
+function renderPorts(p, m) {
+  if (m.ports.length === 0) return [];
+  const pad = Math.max(...m.ports.map((r) => String(r.port).length));
+  const out = ["", p.sectionLine("Ports")];
+  for (const r of m.ports) {
+    const hosts = r.isDefault ? `${m.name}.localhost \xB7 ${m.name}-${r.port}.localhost` : `${m.name}-${r.port}.localhost`;
+    out.push(row(p, " ", String(r.port), p.dim(hosts), pad));
+  }
+  return out;
+}
+function renderBuiltIn(p, m) {
+  const lines = [];
+  if (m.builtIn.languages.length > 0)
+    lines.push({ label: "Languages", values: m.builtIn.languages });
+  if (m.builtIn.features.length > 0)
+    lines.push({ label: "Features", values: m.builtIn.features });
+  if (lines.length === 0) return [];
+  const labelWidth = Math.max(...lines.map((l) => l.label.length));
+  const out = ["", `${p.sectionLine("Built in")}  ${p.dim("from the yml")}`];
+  for (const l of lines) {
+    out.push(`  ${l.label.padEnd(labelWidth)}  ${p.cyan(l.values.join(", "))}`);
+  }
+  return out;
+}
+function renderStatus(m, p) {
+  return [
+    ...renderContainer(p, m),
+    ...renderServices(p, m),
+    ...renderApps(p, m),
+    ...renderPorts(p, m),
+    ...renderBuiltIn(p, m)
+  ].join("\n");
+}
+function renderApp(m, app, p) {
+  const targets = m.apps.filter((a) => a.app === app);
+  if (targets.length === 0) {
+    const known = [...new Set(m.apps.map((a) => a.app))];
+    throw new Error(
+      `No app "${app}" in ${m.name} (have: ${known.join(", ") || "none"}).`
+    );
+  }
+  const out = [p.sectionLine(app)];
+  if (m.appStateNote) out.push(`  ${p.dim(m.appStateNote)}`);
+  const pad = Math.max(...targets.map((t) => t.target.length));
+  for (const t of targets) {
+    out.push(
+      row(
+        p,
+        liveMarker(p, t.running),
+        t.target,
+        appTargetDetail(p, m.name, t),
+        pad,
+        2
+      )
+    );
+  }
+  return out.join("\n");
+}
+function renderService(m, name, p) {
+  const s = m.services.find((svc) => svc.name === name);
+  if (!s) {
+    throw new Error(
+      `No service "${name}" in ${m.name} (have: ${m.services.map((x) => x.name).join(", ") || "none"}).`
+    );
+  }
+  const detail = s.running ? p.dim(typeof s.port === "number" ? `running    :${s.port}` : "running") : p.dim(s.status || "stopped");
+  return [
+    p.sectionLine("Services"),
+    row(p, liveMarker(p, s.running), s.name, detail, s.name.length)
+  ].join("\n");
+}
+var init_status = __esm({
+  "src/status/index.ts"() {
+    "use strict";
+    init_io();
+    init_paths();
+    init_global();
+    init_transform();
+    init_launch_config();
+    init_catalog();
+    init_locate_running();
+    init_dynamic();
+    init_format();
+  }
+});
+
 // src/commands/status.ts
 import { defineCommand as defineCommand31 } from "citty";
 var statusCommand;
-var init_status = __esm({
+var init_status2 = __esm({
   "src/commands/status.ts"() {
     "use strict";
-    init_paths();
-    init_compose();
+    init_status();
+    init_format();
     init_dispatch();
     statusCommand = defineCommand31({
       meta: {
         name: "status",
         group: "run",
-        description: "Show whether the compose services for the named dev-container are running."
+        description: "Show the dev-container at a glance: container, services and apps (up/down), the ports it routes, and what the yml built in. With an <app> (or a service name), narrow to just that."
       },
       args: {
         name: {
@@ -12097,18 +12472,29 @@ var init_status = __esm({
           description: "Container name (yml in $MONOCEROS_HOME/container-configs/).",
           required: true
         },
-        service: {
-          type: "string",
-          description: "Restrict to a single compose service (e.g. postgres). Defaults to all."
+        app: {
+          type: "positional",
+          description: "Narrow to one app (a path under projects/ with .monoceros/launch.json) or one compose service (e.g. postgres). Omit for the whole stack.",
+          required: false
         }
       },
       run({ args }) {
-        return dispatch(
-          () => runStatus({
-            root: containerDir(args.name),
-            ...typeof args.service === "string" ? { service: args.service } : {}
-          })
-        );
+        const filter = typeof args.app === "string" ? args.app : void 0;
+        return dispatch(async () => {
+          const model = await gatherStatus(args.name);
+          const p = colorsFor(process.stdout);
+          let block;
+          if (filter) {
+            const isApp = model.apps.some((a) => a.app === filter);
+            block = isApp ? renderApp(model, filter, p) : renderService(model, filter, p);
+          } else {
+            block = renderStatus(model, p);
+          }
+          process.stdout.write(`
+${block}
+`);
+          return 0;
+        });
       }
     });
   }
@@ -12189,7 +12575,7 @@ var init_stop = __esm({
 
 // src/tunnel/resolve.ts
 import { existsSync as existsSync20 } from "fs";
-import path31 from "path";
+import path32 from "path";
 async function resolveTunnelTarget(opts) {
   const ymlPath = containerConfigPath(opts.name, opts.monocerosHome);
   if (!existsSync20(ymlPath)) {
@@ -12205,7 +12591,7 @@ async function resolveTunnelTarget(opts) {
       `Container '${opts.name}' is not materialised at ${containerRoot}. Run \`monoceros apply ${opts.name}\` first.`
     );
   }
-  const composePath = path31.join(containerRoot, ".devcontainer", "compose.yaml");
+  const composePath = path32.join(containerRoot, ".devcontainer", "compose.yaml");
   const isCompose = existsSync20(composePath);
   const parsedTarget = parseTargetArg(opts.target, config);
   const docker = opts.docker ?? defaultDockerExec;
@@ -12686,7 +13072,7 @@ var init_prune = __esm({
 });
 
 // src/upgrade/index.ts
-import { existsSync as existsSync21, promises as fs19 } from "fs";
+import { existsSync as existsSync21, promises as fs20 } from "fs";
 import { consola as consola39 } from "consola";
 async function fetchRuntimeVersions() {
   const tokenUrl = `https://ghcr.io/token?service=ghcr.io&scope=repository:${RUNTIME_REPO}:pull`;
@@ -12803,10 +13189,10 @@ async function runUpgrade(opts) {
   for (const name of targets) {
     const ymlPath = containerConfigPath(name, home);
     if (!existsSync21(ymlPath)) continue;
-    const raw = await fs19.readFile(ymlPath, "utf8");
+    const raw = await fs20.readFile(ymlPath, "utf8");
     const updated = setRuntimeVersion(raw, pinVersion);
     if (updated !== raw) {
-      await fs19.writeFile(ymlPath, updated);
+      await fs20.writeFile(ymlPath, updated);
       bumped += 1;
       logger.info(`Pinned '${name}' to runtime ${pinVersion}.`);
     }
@@ -12848,7 +13234,7 @@ function formatPruneLine(prune) {
 }
 async function listContainerNames2(home) {
   try {
-    const entries = await fs19.readdir(containerConfigsDir(home));
+    const entries = await fs20.readdir(containerConfigsDir(home));
     return entries.filter((e) => e.endsWith(".yml")).map((e) => e.slice(0, -".yml".length));
   } catch {
     return [];
@@ -12956,7 +13342,7 @@ var init_main = __esm({
     init_run2();
     init_shell2();
     init_start();
-    init_status();
+    init_status2();
     init_stop();
     init_tunnel();
     init_upgrade2();
@@ -13261,25 +13647,25 @@ function detectHelpRequest(argv, main2) {
   const separatorIdx = argv.indexOf("--");
   if (helpIdx === -1) return null;
   if (separatorIdx !== -1 && separatorIdx < helpIdx) return null;
-  const path32 = [];
+  const path33 = [];
   const tokens = argv.slice(
     0,
     separatorIdx === -1 ? argv.length : separatorIdx
   );
   let cursor = main2;
   const mainName = (main2.meta ?? {}).name ?? "monoceros";
-  path32.push(mainName);
+  path33.push(mainName);
   for (const tok of tokens) {
     if (tok.startsWith("-")) continue;
     const subs = cursor.subCommands ?? {};
     if (tok in subs) {
       cursor = subs[tok];
-      path32.push(tok);
+      path33.push(tok);
       continue;
     }
     break;
   }
-  return { path: path32, cmd: cursor };
+  return { path: path33, cmd: cursor };
 }
 async function maybeRenderHelp(argv, main2) {
   const hit = detectHelpRequest(argv, main2);