@zitadel/cli 0.1.0-alpha.1 → 0.1.0-alpha.2

package/dist/commands/start.mjs

@@ -1,5 +1,5 @@
-import { T as ZitadelError, d as ensureContainerIdentity, f as ensureLocalState, g as localServerUrl, m as localContainerName, s as DEFAULT_LOCAL_SERVER_PORT, t as BaseCommand, u as checkLocalServerHealth, x as writeRuntimeMetadata } from "../oclif-DSPO9Sck.mjs";
-import { c as metadataFromStart, i as ensureImage, l as startContainer, n as currentUser, s as inspectContainer, u as stopAndRemoveContainer } from "../docker-C0aVpJqm.mjs";
+import { E as ZitadelError, a as DEFAULT_LOCAL_SERVER_PORT, b as writeRuntimeMetadata, c as checkLocalServerHealth, d as ensureLocalState, h as localServerUrl, l as defaultLocalServerImageForCliVersion, p as localContainerName, t as BaseCommand, u as ensureContainerIdentity, x as publicCliCommand } from "../oclif-CqkWBQ7i.mjs";
+import { c as metadataFromStart, i as ensureImage, l as startContainer, n as currentUser, s as inspectContainer, u as stopAndRemoveContainer } from "../docker-DrOBycgG.mjs";
 import { Flags } from "@oclif/core";
 import { setTimeout } from "node:timers/promises";
 //#region src/commands/start.ts
@@ -22,7 +22,7 @@ var Start = class Start extends BaseCommand {
 			source: serverUrl
 		});
 		validatePort(port);
-		const image = flags.image ?? this.meta.env.ZITADEL_LOCAL_IMAGE ?? "ghcr.io/zitadel/nextgen:latest";
+		const image = flags.image ?? this.meta.env.ZITADEL_LOCAL_IMAGE ?? defaultLocalServerImageForCliVersion(this.meta.cliVersion);
 		const containerName = localContainerName(this.meta.cwd);
 		if (this.meta.dryRun) return this.emit({
 			status: "ok",
@@ -38,12 +38,12 @@ var Start = class Start extends BaseCommand {
 					console: `${serverUrl}/ui/console/`,
 					login: `${serverUrl}/ui/login/`
 				},
-				next_commands: ["zitadel start"]
+				next_commands: [publicCliCommand("start", this.meta.cliVersion)]
 			}
 		});
 		const paths = await ensureLocalState(this.meta.cwd);
 		const existing = await inspectContainer(containerName);
-		if (existing.exists && existing.running && await checkLocalServerHealth(serverUrl)) {
+		if (existing.exists && existing.running && existing.image === image && await checkLocalServerHealth(serverUrl)) {
 			const metadata = metadataFromStart({
 				cwdDataDir: paths.dataDir,
 				cliVersion: this.meta.cliVersion,
@@ -56,7 +56,7 @@ var Start = class Start extends BaseCommand {
 			await writeRuntimeMetadata(this.meta.cwd, metadata);
 			return this.emit({
 				status: "ok",
-				data: readyData(metadata, true)
+				data: readyData(metadata, true, this.meta.cliVersion)
 			});
 		}
 		if (existing.exists) await stopAndRemoveContainer(containerName);
@@ -68,7 +68,7 @@ var Start = class Start extends BaseCommand {
 			dataDir: paths.dataDir,
 			identity: await ensureContainerIdentity(this.meta.cwd, currentUser())
 		});
-		await waitForHealth(serverUrl, containerName);
+		await waitForHealth(serverUrl, containerName, this.meta.cliVersion);
 		const metadata = metadataFromStart({
 			cwdDataDir: paths.dataDir,
 			cliVersion: this.meta.cliVersion,
@@ -81,11 +81,11 @@ var Start = class Start extends BaseCommand {
 		await writeRuntimeMetadata(this.meta.cwd, metadata);
 		return this.emit({
 			status: "ok",
-			data: readyData(metadata, false)
+			data: readyData(metadata, false, this.meta.cliVersion)
 		});
 	}
 };
-function readyData(metadata, alreadyRunning) {
+function readyData(metadata, alreadyRunning, cliVersion) {
 	return {
 		title: alreadyRunning ? "Local Zitadel server is already running." : "Local Zitadel server is ready.",
 		runtime: {
@@ -100,15 +100,11 @@ function readyData(metadata, alreadyRunning) {
 			console: `${metadata.server_url}/ui/console/`,
 			login: `${metadata.server_url}/ui/login/`
 		},
-		next_actions: ["Set up your app, then start its dev server."],
-		next_commands: [
-			"npx @zitadel/cli@alpha setup --framework next --server local",
-			"npm install",
-			"npm run dev"
-		]
+		next_actions: ["From your app directory, run setup; the CLI will detect the framework or ask when needed.", "Setup installs dependencies when needed; then start your app dev server."],
+		next_commands: [publicCliCommand("setup --server local", cliVersion)]
 	};
 }
-async function waitForHealth(serverUrl, containerName) {
+async function waitForHealth(serverUrl, containerName, cliVersion) {
 	const started = Date.now();
 	while (Date.now() - started < START_TIMEOUT_MS) {
 		if (await checkLocalServerHealth(serverUrl, 1e3)) return;
@@ -116,7 +112,7 @@ async function waitForHealth(serverUrl, containerName) {
 	}
 	throw new ZitadelError("E_NETWORK", "Local Zitadel server did not become healthy", {
 		hint: "Inspect the container logs, then reset the local runtime if needed.",
-		nextCommands: ["zitadel logs", "zitadel reset --force"],
+		nextCommands: [publicCliCommand("logs", cliVersion), publicCliCommand("reset --force", cliVersion)],
 		details: {
 			container_name: containerName,
 			server_url: serverUrl

package/dist/commands/start.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"start.mjs","names":["sleep"],"sources":["../../src/commands/start.ts"],"sourcesContent":["import { setTimeout as sleep } from \"node:timers/promises\";\n\nimport { Flags } from \"@oclif/core\";\n\nimport { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport { ZitadelError } from \"../lib/errors\";\nimport {\n  currentUser,\n  ensureImage,\n  inspectContainer,\n  metadataFromStart,\n  startContainer,\n  stopAndRemoveContainer,\n} from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_IMAGE,\n  DEFAULT_LOCAL_SERVER_PORT,\n  checkLocalServerHealth,\n  ensureContainerIdentity,\n  ensureLocalState,\n  localContainerName,\n  localServerUrl,\n  writeRuntimeMetadata,\n} from \"../lib/local-server/runtime\";\n\nconst START_TIMEOUT_MS = 90_000;\n\nexport default class Start extends BaseCommand {\n  static override description = \"Start a local Zitadel server.\";\n  static override flags = {\n    image: Flags.string({ description: \"Container image to run.\" }),\n    port: Flags.integer({ description: \"Local HTTP port.\", default: DEFAULT_LOCAL_SERVER_PORT }),\n  };\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Start);\n    const port = flags.port ?? DEFAULT_LOCAL_SERVER_PORT;\n    const serverUrl = localServerUrl(port);\n    await this.toMeta(flags, { resolveServer: false, source: serverUrl });\n\n    validatePort(port);\n    const image = flags.image ?? this.meta.env.ZITADEL_LOCAL_IMAGE ?? DEFAULT_LOCAL_SERVER_IMAGE;\n    const containerName = localContainerName(this.meta.cwd);\n    if (this.meta.dryRun) {\n      return this.emit({\n        status: \"ok\",\n        data: {\n          title: \"Local Zitadel server start plan.\",\n          runtime: {\n            container_name: containerName,\n            image,\n            port,\n          },\n          urls: {\n            api: serverUrl,\n            console: `${serverUrl}/ui/console/`,\n            login: `${serverUrl}/ui/login/`,\n          },\n          next_commands: [\"zitadel start\"],\n        },\n      });\n    }\n\n    const paths = await ensureLocalState(this.meta.cwd);\n\n    const existing = await inspectContainer(containerName);\n    if (existing.exists && existing.running && (await checkLocalServerHealth(serverUrl))) {\n      const metadata = metadataFromStart({\n        cwdDataDir: paths.dataDir,\n        cliVersion: this.meta.cliVersion,\n        containerName,\n        containerId: existing.id ?? containerName,\n        image,\n        port,\n        serverUrl,\n      });\n      await writeRuntimeMetadata(this.meta.cwd, metadata);\n      return this.emit({ status: \"ok\", data: readyData(metadata, true) });\n    }\n\n    if (existing.exists) {\n      await stopAndRemoveContainer(containerName);\n    }\n\n    await ensureImage(image);\n    const containerId = await startContainer({\n      containerName,\n      image,\n      port,\n      dataDir: paths.dataDir,\n      identity: await ensureContainerIdentity(this.meta.cwd, currentUser()),\n    });\n    await waitForHealth(serverUrl, containerName);\n\n    const metadata = metadataFromStart({\n      cwdDataDir: paths.dataDir,\n      cliVersion: this.meta.cliVersion,\n      containerName,\n      containerId,\n      image,\n      port,\n      serverUrl,\n    });\n    await writeRuntimeMetadata(this.meta.cwd, metadata);\n    return this.emit({ status: \"ok\", data: readyData(metadata, false) });\n  }\n}\n\nfunction readyData(metadata: ReturnType<typeof metadataFromStart>, alreadyRunning: boolean) {\n  return {\n    title: alreadyRunning\n      ? \"Local Zitadel server is already running.\"\n      : \"Local Zitadel server is ready.\",\n    runtime: {\n      container_name: metadata.container_name,\n      container_id: metadata.container_id,\n      image: metadata.image,\n      port: metadata.port,\n      data_dir: metadata.data_dir,\n    },\n    urls: {\n      api: metadata.server_url,\n      console: `${metadata.server_url}/ui/console/`,\n      login: `${metadata.server_url}/ui/login/`,\n    },\n    next_actions: [\"Set up your app, then start its dev server.\"],\n    next_commands: [\n      \"npx @zitadel/cli@alpha setup --framework next --server local\",\n      \"npm install\",\n      \"npm run dev\",\n    ],\n  };\n}\n\nasync function waitForHealth(serverUrl: string, containerName: string): Promise<void> {\n  const started = Date.now();\n  while (Date.now() - started < START_TIMEOUT_MS) {\n    if (await checkLocalServerHealth(serverUrl, 1000)) {\n      return;\n    }\n    await sleep(1000);\n  }\n  throw new ZitadelError(\"E_NETWORK\", \"Local Zitadel server did not become healthy\", {\n    hint: \"Inspect the container logs, then reset the local runtime if needed.\",\n    nextCommands: [\"zitadel logs\", \"zitadel reset --force\"],\n    details: { container_name: containerName, server_url: serverUrl },\n  });\n}\n\nfunction validatePort(port: number): void {\n  if (!Number.isInteger(port) || port < 1 || port > 65_535) {\n    throw new ZitadelError(\"E_VALIDATION\", `Invalid port ${String(port)}`, {\n      hint: \"Use a TCP port between 1 and 65535.\",\n    });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"start.mjs","names":["sleep"],"sources":["../../src/commands/start.ts"],"sourcesContent":["import { setTimeout as sleep } from \"node:timers/promises\";\n\nimport { Flags } from \"@oclif/core\";\n\nimport { ZitadelError } from \"../lib/errors\";\nimport {\n  currentUser,\n  ensureImage,\n  inspectContainer,\n  metadataFromStart,\n  startContainer,\n  stopAndRemoveContainer,\n} from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_PORT,\n  checkLocalServerHealth,\n  defaultLocalServerImageForCliVersion,\n  ensureContainerIdentity,\n  ensureLocalState,\n  localContainerName,\n  localServerUrl,\n  writeRuntimeMetadata,\n} from \"../lib/local-server/runtime\";\nimport { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport { publicCliCommand } from \"../lib/public-cli\";\n\nconst START_TIMEOUT_MS = 90_000;\n\nexport default class Start extends BaseCommand {\n  static override description = \"Start a local Zitadel server.\";\n  static override flags = {\n    image: Flags.string({ description: \"Container image to run.\" }),\n    port: Flags.integer({ description: \"Local HTTP port.\", default: DEFAULT_LOCAL_SERVER_PORT }),\n  };\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Start);\n    const port = flags.port ?? DEFAULT_LOCAL_SERVER_PORT;\n    const serverUrl = localServerUrl(port);\n    await this.toMeta(flags, { resolveServer: false, source: serverUrl });\n\n    validatePort(port);\n    const image =\n      flags.image ??\n      this.meta.env.ZITADEL_LOCAL_IMAGE ??\n      defaultLocalServerImageForCliVersion(this.meta.cliVersion);\n    const containerName = localContainerName(this.meta.cwd);\n    if (this.meta.dryRun) {\n      return this.emit({\n        status: \"ok\",\n        data: {\n          title: \"Local Zitadel server start plan.\",\n          runtime: {\n            container_name: containerName,\n            image,\n            port,\n          },\n          urls: {\n            api: serverUrl,\n            console: `${serverUrl}/ui/console/`,\n            login: `${serverUrl}/ui/login/`,\n          },\n          next_commands: [publicCliCommand(\"start\", this.meta.cliVersion)],\n        },\n      });\n    }\n\n    const paths = await ensureLocalState(this.meta.cwd);\n\n    const existing = await inspectContainer(containerName);\n    if (\n      existing.exists &&\n      existing.running &&\n      existing.image === image &&\n      (await checkLocalServerHealth(serverUrl))\n    ) {\n      const metadata = metadataFromStart({\n        cwdDataDir: paths.dataDir,\n        cliVersion: this.meta.cliVersion,\n        containerName,\n        containerId: existing.id ?? containerName,\n        image,\n        port,\n        serverUrl,\n      });\n      await writeRuntimeMetadata(this.meta.cwd, metadata);\n      return this.emit({\n        status: \"ok\",\n        data: readyData(metadata, true, this.meta.cliVersion),\n      });\n    }\n\n    if (existing.exists) {\n      await stopAndRemoveContainer(containerName);\n    }\n\n    await ensureImage(image);\n    const containerId = await startContainer({\n      containerName,\n      image,\n      port,\n      dataDir: paths.dataDir,\n      identity: await ensureContainerIdentity(this.meta.cwd, currentUser()),\n    });\n    await waitForHealth(serverUrl, containerName, this.meta.cliVersion);\n\n    const metadata = metadataFromStart({\n      cwdDataDir: paths.dataDir,\n      cliVersion: this.meta.cliVersion,\n      containerName,\n      containerId,\n      image,\n      port,\n      serverUrl,\n    });\n    await writeRuntimeMetadata(this.meta.cwd, metadata);\n    return this.emit({\n      status: \"ok\",\n      data: readyData(metadata, false, this.meta.cliVersion),\n    });\n  }\n}\n\nfunction readyData(\n  metadata: ReturnType<typeof metadataFromStart>,\n  alreadyRunning: boolean,\n  cliVersion: string,\n) {\n  return {\n    title: alreadyRunning\n      ? \"Local Zitadel server is already running.\"\n      : \"Local Zitadel server is ready.\",\n    runtime: {\n      container_name: metadata.container_name,\n      container_id: metadata.container_id,\n      image: metadata.image,\n      port: metadata.port,\n      data_dir: metadata.data_dir,\n    },\n    urls: {\n      api: metadata.server_url,\n      console: `${metadata.server_url}/ui/console/`,\n      login: `${metadata.server_url}/ui/login/`,\n    },\n    next_actions: [\n      \"From your app directory, run setup; the CLI will detect the framework or ask when needed.\",\n      \"Setup installs dependencies when needed; then start your app dev server.\",\n    ],\n    next_commands: [publicCliCommand(\"setup --server local\", cliVersion)],\n  };\n}\n\nasync function waitForHealth(\n  serverUrl: string,\n  containerName: string,\n  cliVersion: string,\n): Promise<void> {\n  const started = Date.now();\n  while (Date.now() - started < START_TIMEOUT_MS) {\n    if (await checkLocalServerHealth(serverUrl, 1000)) {\n      return;\n    }\n    await sleep(1000);\n  }\n  throw new ZitadelError(\"E_NETWORK\", \"Local Zitadel server did not become healthy\", {\n    hint: \"Inspect the container logs, then reset the local runtime if needed.\",\n    nextCommands: [\n      publicCliCommand(\"logs\", cliVersion),\n      publicCliCommand(\"reset --force\", cliVersion),\n    ],\n    details: { container_name: containerName, server_url: serverUrl },\n  });\n}\n\nfunction validatePort(port: number): void {\n  if (!Number.isInteger(port) || port < 1 || port > 65_535) {\n    throw new ZitadelError(\"E_VALIDATION\", `Invalid port ${String(port)}`, {\n      hint: \"Use a TCP port between 1 and 65535.\",\n    });\n  }\n}\n"],"mappings":"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"}

package/dist/commands/status.mjs

@@ -1,6 +1,6 @@
-import { _ as readRuntimeMetadata, b as runtimeSummary, m as localContainerName, t as BaseCommand, u as checkLocalServerHealth } from "../oclif-DSPO9Sck.mjs";
-import { a as readZitadelConfig, n as hasZitadelSecret, o as readZitadelSecret, r as readDevelopmentIssuer, t as hasZitadelConfig } from "../project-Dwb9WVAT.mjs";
-import { s as inspectContainer } from "../docker-C0aVpJqm.mjs";
+import { c as checkLocalServerHealth, g as readRuntimeMetadata, p as localContainerName, t as BaseCommand, x as publicCliCommand, y as runtimeSummary } from "../oclif-CqkWBQ7i.mjs";
+import { a as readZitadelConfig, n as hasZitadelSecret, o as readZitadelSecret, r as readDevelopmentIssuer, t as hasZitadelConfig } from "../project-B6YfSaZw.mjs";
+import { s as inspectContainer } from "../docker-DrOBycgG.mjs";
 //#region src/commands/status.ts
 /**
 * `zitadel status` — summarize the local server and project state.
@@ -31,7 +31,8 @@ var Status = class Status extends BaseCommand {
 		const healthy = runtime ? await checkLocalServerHealth(runtime.server_url) : false;
 		const serverLifecycle = runtime ? docker?.running && healthy ? "running" : docker?.exists ? "unhealthy" : "stopped" : "missing";
 		const project = await projectStatus(cwd);
-		const nextCommands = nextCommandsFor(serverLifecycle, project.lifecycle);
+		const nextCommands = nextCommandsFor(serverLifecycle, project.lifecycle, this.meta.cliVersion);
+		const nextActions = nextActionsFor(project.lifecycle);
 		return this.emit({
 			status: "ok",
 			data: {
@@ -51,6 +52,7 @@ var Status = class Status extends BaseCommand {
 					}
 				},
 				project,
+				next_actions: nextActions,
 				next_commands: nextCommands
 			}
 		});
@@ -74,12 +76,16 @@ async function projectStatus(cwd) {
 		issuer: readDevelopmentIssuer(config)
 	};
 }
-function nextCommandsFor(serverLifecycle, projectLifecycle) {
+function nextActionsFor(projectLifecycle) {
+	if (projectLifecycle === "not-configured") return ["From your app directory, run setup; the CLI will detect the framework or ask in an empty directory."];
+	return [];
+}
+function nextCommandsFor(serverLifecycle, projectLifecycle, cliVersion) {
 	const commands = [];
-	if (serverLifecycle !== "running") commands.push("zitadel start");
-	if (projectLifecycle === "not-configured") commands.push("zitadel setup --framework next --server local");
-	else if (projectLifecycle === "orphaned-config") commands.push("zitadel setup --force", "zitadel doctor --fix");
-	else commands.push("zitadel doctor", "zitadel apply");
+	if (serverLifecycle !== "running") commands.push(publicCliCommand("start", cliVersion));
+	if (projectLifecycle === "not-configured") commands.push(publicCliCommand("setup --server local", cliVersion));
+	else if (projectLifecycle === "orphaned-config") commands.push(publicCliCommand("setup --force", cliVersion), publicCliCommand("doctor --fix", cliVersion));
+	else commands.push(publicCliCommand("doctor", cliVersion), publicCliCommand("apply", cliVersion));
 	return commands;
 }
 //#endregion

package/dist/commands/status.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"status.mjs","names":[],"sources":["../../src/commands/status.ts"],"sourcesContent":["import { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport { inspectContainer } from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_URL,\n  checkLocalServerHealth,\n  localContainerName,\n  readRuntimeMetadata,\n  runtimeSummary,\n} from \"../lib/local-server/runtime\";\nimport {\n  hasZitadelConfig,\n  hasZitadelSecret,\n  readDevelopmentIssuer,\n  readZitadelConfig,\n  readZitadelSecret,\n} from \"../lib/project\";\n\n/**\n * `zitadel status` — summarize the local server and project state.\n *\n * This is intentionally informational: a missing `zitadel.json`, stopped\n * local server, or orphaned config should be visible without making `status`\n * itself fail.\n */\nexport default class Status extends BaseCommand {\n  static override description = \"Summarize the local Zitadel server and project state.\";\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Status);\n    const runtime = await readRuntimeMetadata(flags.cwd ? String(flags.cwd) : process.cwd());\n    if (flags.server === \"local\") {\n      await this.toMeta(flags, {\n        resolveServer: false,\n        source: runtime?.server_url ?? DEFAULT_LOCAL_SERVER_URL,\n      });\n    } else {\n      await this.toMeta(flags);\n    }\n    const { cwd } = this.meta;\n\n    const containerName = runtime?.container_name ?? localContainerName(cwd);\n    let docker: Awaited<ReturnType<typeof inspectContainer>> | undefined;\n    let dockerError: string | undefined;\n    try {\n      docker = await inspectContainer(containerName);\n    } catch (error) {\n      dockerError = error instanceof Error ? error.message : String(error);\n    }\n    const healthy = runtime ? await checkLocalServerHealth(runtime.server_url) : false;\n    const serverLifecycle = runtime\n      ? docker?.running && healthy\n        ? \"running\"\n        : docker?.exists\n          ? \"unhealthy\"\n          : \"stopped\"\n      : \"missing\";\n\n    const project = await projectStatus(cwd);\n    const nextCommands = nextCommandsFor(serverLifecycle, project.lifecycle);\n\n    return this.emit({\n      status: \"ok\",\n      data: {\n        title: \"Zitadel status.\",\n        server: {\n          lifecycle: serverLifecycle,\n          runtime: runtimeSummary(runtime),\n          docker: {\n            available: dockerError === undefined,\n            error: dockerError,\n            container_exists: docker?.exists ?? false,\n            container_running: docker?.running ?? false,\n          },\n          health: {\n            healthy,\n            url: runtime?.server_url,\n          },\n        },\n        project,\n        next_commands: nextCommands,\n      },\n    });\n  }\n}\n\ntype ProjectStatus =\n  | {\n      lifecycle: \"not-configured\";\n      message: string;\n    }\n  | {\n      lifecycle: \"orphaned-config\";\n      project_id?: string;\n      message: string;\n    }\n  | {\n      lifecycle: \"configured\";\n      project_id: string;\n      issuer?: string;\n    };\n\nasync function projectStatus(cwd: string): Promise<ProjectStatus> {\n  if (!(await hasZitadelConfig(cwd))) {\n    return {\n      lifecycle: \"not-configured\",\n      message: \"zitadel.json has not been created yet.\",\n    };\n  }\n\n  const config = await readZitadelConfig(cwd);\n  if (!(await hasZitadelSecret(cwd))) {\n    return {\n      lifecycle: \"orphaned-config\",\n      project_id: typeof config.project === \"string\" ? config.project : undefined,\n      message: \"zitadel.json exists but .zitadel/secret is missing.\",\n    };\n  }\n\n  const secret = await readZitadelSecret(cwd);\n  return {\n    lifecycle: \"configured\",\n    project_id: String(config.project ?? secret.project_id ?? \"\"),\n    issuer: readDevelopmentIssuer(config),\n  };\n}\n\nfunction nextCommandsFor(serverLifecycle: string, projectLifecycle: ProjectStatus[\"lifecycle\"]): string[] {\n  const commands: string[] = [];\n  if (serverLifecycle !== \"running\") {\n    commands.push(\"zitadel start\");\n  }\n  if (projectLifecycle === \"not-configured\") {\n    commands.push(\"zitadel setup --framework next --server local\");\n  } else if (projectLifecycle === \"orphaned-config\") {\n    commands.push(\"zitadel setup --force\", \"zitadel doctor --fix\");\n  } else {\n    commands.push(\"zitadel doctor\", \"zitadel apply\");\n  }\n  return commands;\n}\n"],"mappings":";;;;;;;;;;;AAwBA,IAAqB,SAArB,MAAqB,eAAe,YAAY;CAC9C,OAAgB,cAAc;CAE9B,MAAM,MAA6B;EACjC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,OAAO;EAC1C,MAAM,UAAU,MAAM,oBAAoB,MAAM,MAAM,OAAO,MAAM,IAAI,GAAG,QAAQ,KAAK,CAAC;AACxF,MAAI,MAAM,WAAW,QACnB,OAAM,KAAK,OAAO,OAAO;GACvB,eAAe;GACf,QAAQ,SAAS,cAAA;GAClB,CAAC;MAEF,OAAM,KAAK,OAAO,MAAM;EAE1B,MAAM,EAAE,QAAQ,KAAK;EAErB,MAAM,gBAAgB,SAAS,kBAAkB,mBAAmB,IAAI;EACxE,IAAI;EACJ,IAAI;AACJ,MAAI;AACF,YAAS,MAAM,iBAAiB,cAAc;WACvC,OAAO;AACd,iBAAc,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;;EAEtE,MAAM,UAAU,UAAU,MAAM,uBAAuB,QAAQ,WAAW,GAAG;EAC7E,MAAM,kBAAkB,UACpB,QAAQ,WAAW,UACjB,YACA,QAAQ,SACN,cACA,YACJ;EAEJ,MAAM,UAAU,MAAM,cAAc,IAAI;EACxC,MAAM,eAAe,gBAAgB,iBAAiB,QAAQ,UAAU;AAExE,SAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,QAAQ;KACN,WAAW;KACX,SAAS,eAAe,QAAQ;KAChC,QAAQ;MACN,WAAW,gBAAgB,KAAA;MAC3B,OAAO;MACP,kBAAkB,QAAQ,UAAU;MACpC,mBAAmB,QAAQ,WAAW;MACvC;KACD,QAAQ;MACN;MACA,KAAK,SAAS;MACf;KACF;IACD;IACA,eAAe;IAChB;GACF,CAAC;;;AAoBN,eAAe,cAAc,KAAqC;AAChE,KAAI,CAAE,MAAM,iBAAiB,IAAI,CAC/B,QAAO;EACL,WAAW;EACX,SAAS;EACV;CAGH,MAAM,SAAS,MAAM,kBAAkB,IAAI;AAC3C,KAAI,CAAE,MAAM,iBAAiB,IAAI,CAC/B,QAAO;EACL,WAAW;EACX,YAAY,OAAO,OAAO,YAAY,WAAW,OAAO,UAAU,KAAA;EAClE,SAAS;EACV;CAGH,MAAM,SAAS,MAAM,kBAAkB,IAAI;AAC3C,QAAO;EACL,WAAW;EACX,YAAY,OAAO,OAAO,WAAW,OAAO,cAAc,GAAG;EAC7D,QAAQ,sBAAsB,OAAO;EACtC;;AAGH,SAAS,gBAAgB,iBAAyB,kBAAwD;CACxG,MAAM,WAAqB,EAAE;AAC7B,KAAI,oBAAoB,UACtB,UAAS,KAAK,gBAAgB;AAEhC,KAAI,qBAAqB,iBACvB,UAAS,KAAK,gDAAgD;UACrD,qBAAqB,kBAC9B,UAAS,KAAK,yBAAyB,uBAAuB;KAE9D,UAAS,KAAK,kBAAkB,gBAAgB;AAElD,QAAO"}
+{"version":3,"file":"status.mjs","names":[],"sources":["../../src/commands/status.ts"],"sourcesContent":["import { inspectContainer } from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_URL,\n  checkLocalServerHealth,\n  localContainerName,\n  readRuntimeMetadata,\n  runtimeSummary,\n} from \"../lib/local-server/runtime\";\nimport { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport {\n  hasZitadelConfig,\n  hasZitadelSecret,\n  readDevelopmentIssuer,\n  readZitadelConfig,\n  readZitadelSecret,\n} from \"../lib/project\";\nimport { publicCliCommand } from \"../lib/public-cli\";\n\n/**\n * `zitadel status` — summarize the local server and project state.\n *\n * This is intentionally informational: a missing `zitadel.json`, stopped\n * local server, or orphaned config should be visible without making `status`\n * itself fail.\n */\nexport default class Status extends BaseCommand {\n  static override description = \"Summarize the local Zitadel server and project state.\";\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Status);\n    const runtime = await readRuntimeMetadata(flags.cwd ? String(flags.cwd) : process.cwd());\n    if (flags.server === \"local\") {\n      await this.toMeta(flags, {\n        resolveServer: false,\n        source: runtime?.server_url ?? DEFAULT_LOCAL_SERVER_URL,\n      });\n    } else {\n      await this.toMeta(flags);\n    }\n    const { cwd } = this.meta;\n\n    const containerName = runtime?.container_name ?? localContainerName(cwd);\n    let docker: Awaited<ReturnType<typeof inspectContainer>> | undefined;\n    let dockerError: string | undefined;\n    try {\n      docker = await inspectContainer(containerName);\n    } catch (error) {\n      dockerError = error instanceof Error ? error.message : String(error);\n    }\n    const healthy = runtime ? await checkLocalServerHealth(runtime.server_url) : false;\n    const serverLifecycle = runtime\n      ? docker?.running && healthy\n        ? \"running\"\n        : docker?.exists\n          ? \"unhealthy\"\n          : \"stopped\"\n      : \"missing\";\n\n    const project = await projectStatus(cwd);\n    const nextCommands = nextCommandsFor(serverLifecycle, project.lifecycle, this.meta.cliVersion);\n    const nextActions = nextActionsFor(project.lifecycle);\n\n    return this.emit({\n      status: \"ok\",\n      data: {\n        title: \"Zitadel status.\",\n        server: {\n          lifecycle: serverLifecycle,\n          runtime: runtimeSummary(runtime),\n          docker: {\n            available: dockerError === undefined,\n            error: dockerError,\n            container_exists: docker?.exists ?? false,\n            container_running: docker?.running ?? false,\n          },\n          health: {\n            healthy,\n            url: runtime?.server_url,\n          },\n        },\n        project,\n        next_actions: nextActions,\n        next_commands: nextCommands,\n      },\n    });\n  }\n}\n\ntype ProjectStatus =\n  | {\n      lifecycle: \"not-configured\";\n      message: string;\n    }\n  | {\n      lifecycle: \"orphaned-config\";\n      project_id?: string;\n      message: string;\n    }\n  | {\n      lifecycle: \"configured\";\n      project_id: string;\n      issuer?: string;\n    };\n\nasync function projectStatus(cwd: string): Promise<ProjectStatus> {\n  if (!(await hasZitadelConfig(cwd))) {\n    return {\n      lifecycle: \"not-configured\",\n      message: \"zitadel.json has not been created yet.\",\n    };\n  }\n\n  const config = await readZitadelConfig(cwd);\n  if (!(await hasZitadelSecret(cwd))) {\n    return {\n      lifecycle: \"orphaned-config\",\n      project_id: typeof config.project === \"string\" ? config.project : undefined,\n      message: \"zitadel.json exists but .zitadel/secret is missing.\",\n    };\n  }\n\n  const secret = await readZitadelSecret(cwd);\n  return {\n    lifecycle: \"configured\",\n    project_id: String(config.project ?? secret.project_id ?? \"\"),\n    issuer: readDevelopmentIssuer(config),\n  };\n}\n\nfunction nextActionsFor(projectLifecycle: ProjectStatus[\"lifecycle\"]): string[] {\n  if (projectLifecycle === \"not-configured\") {\n    return [\n      \"From your app directory, run setup; the CLI will detect the framework or ask in an empty directory.\",\n    ];\n  }\n  return [];\n}\n\nfunction nextCommandsFor(\n  serverLifecycle: string,\n  projectLifecycle: ProjectStatus[\"lifecycle\"],\n  cliVersion: string,\n): string[] {\n  const commands: string[] = [];\n  if (serverLifecycle !== \"running\") {\n    commands.push(publicCliCommand(\"start\", cliVersion));\n  }\n  if (projectLifecycle === \"not-configured\") {\n    commands.push(publicCliCommand(\"setup --server local\", cliVersion));\n  } else if (projectLifecycle === \"orphaned-config\") {\n    commands.push(\n      publicCliCommand(\"setup --force\", cliVersion),\n      publicCliCommand(\"doctor --fix\", cliVersion),\n    );\n  } else {\n    commands.push(publicCliCommand(\"doctor\", cliVersion), publicCliCommand(\"apply\", cliVersion));\n  }\n  return commands;\n}\n"],"mappings":";;;;;;;;;;;AAyBA,IAAqB,SAArB,MAAqB,eAAe,YAAY;CAC9C,OAAgB,cAAc;CAE9B,MAAM,MAA6B;EACjC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,OAAO;EAC1C,MAAM,UAAU,MAAM,oBAAoB,MAAM,MAAM,OAAO,MAAM,IAAI,GAAG,QAAQ,KAAK,CAAC;AACxF,MAAI,MAAM,WAAW,QACnB,OAAM,KAAK,OAAO,OAAO;GACvB,eAAe;GACf,QAAQ,SAAS,cAAA;GAClB,CAAC;MAEF,OAAM,KAAK,OAAO,MAAM;EAE1B,MAAM,EAAE,QAAQ,KAAK;EAErB,MAAM,gBAAgB,SAAS,kBAAkB,mBAAmB,IAAI;EACxE,IAAI;EACJ,IAAI;AACJ,MAAI;AACF,YAAS,MAAM,iBAAiB,cAAc;WACvC,OAAO;AACd,iBAAc,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;;EAEtE,MAAM,UAAU,UAAU,MAAM,uBAAuB,QAAQ,WAAW,GAAG;EAC7E,MAAM,kBAAkB,UACpB,QAAQ,WAAW,UACjB,YACA,QAAQ,SACN,cACA,YACJ;EAEJ,MAAM,UAAU,MAAM,cAAc,IAAI;EACxC,MAAM,eAAe,gBAAgB,iBAAiB,QAAQ,WAAW,KAAK,KAAK,WAAW;EAC9F,MAAM,cAAc,eAAe,QAAQ,UAAU;AAErD,SAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,QAAQ;KACN,WAAW;KACX,SAAS,eAAe,QAAQ;KAChC,QAAQ;MACN,WAAW,gBAAgB,KAAA;MAC3B,OAAO;MACP,kBAAkB,QAAQ,UAAU;MACpC,mBAAmB,QAAQ,WAAW;MACvC;KACD,QAAQ;MACN;MACA,KAAK,SAAS;MACf;KACF;IACD;IACA,cAAc;IACd,eAAe;IAChB;GACF,CAAC;;;AAoBN,eAAe,cAAc,KAAqC;AAChE,KAAI,CAAE,MAAM,iBAAiB,IAAI,CAC/B,QAAO;EACL,WAAW;EACX,SAAS;EACV;CAGH,MAAM,SAAS,MAAM,kBAAkB,IAAI;AAC3C,KAAI,CAAE,MAAM,iBAAiB,IAAI,CAC/B,QAAO;EACL,WAAW;EACX,YAAY,OAAO,OAAO,YAAY,WAAW,OAAO,UAAU,KAAA;EAClE,SAAS;EACV;CAGH,MAAM,SAAS,MAAM,kBAAkB,IAAI;AAC3C,QAAO;EACL,WAAW;EACX,YAAY,OAAO,OAAO,WAAW,OAAO,cAAc,GAAG;EAC7D,QAAQ,sBAAsB,OAAO;EACtC;;AAGH,SAAS,eAAe,kBAAwD;AAC9E,KAAI,qBAAqB,iBACvB,QAAO,CACL,sGACD;AAEH,QAAO,EAAE;;AAGX,SAAS,gBACP,iBACA,kBACA,YACU;CACV,MAAM,WAAqB,EAAE;AAC7B,KAAI,oBAAoB,UACtB,UAAS,KAAK,iBAAiB,SAAS,WAAW,CAAC;AAEtD,KAAI,qBAAqB,iBACvB,UAAS,KAAK,iBAAiB,wBAAwB,WAAW,CAAC;UAC1D,qBAAqB,kBAC9B,UAAS,KACP,iBAAiB,iBAAiB,WAAW,EAC7C,iBAAiB,gBAAgB,WAAW,CAC7C;KAED,UAAS,KAAK,iBAAiB,UAAU,WAAW,EAAE,iBAAiB,SAAS,WAAW,CAAC;AAE9F,QAAO"}

package/dist/commands/stop.mjs

@@ -1,5 +1,5 @@
-import { _ as readRuntimeMetadata, m as localContainerName, t as BaseCommand } from "../oclif-DSPO9Sck.mjs";
-import { u as stopAndRemoveContainer } from "../docker-C0aVpJqm.mjs";
+import { g as readRuntimeMetadata, p as localContainerName, t as BaseCommand, x as publicCliCommand } from "../oclif-CqkWBQ7i.mjs";
+import { u as stopAndRemoveContainer } from "../docker-DrOBycgG.mjs";
 //#region src/commands/stop.ts
 var Stop = class Stop extends BaseCommand {
 	static description = "Stop the local Zitadel server.";
@@ -20,7 +20,7 @@ var Stop = class Stop extends BaseCommand {
 					data_preserved: true,
 					data_dir: runtime?.data_dir
 				},
-				next_commands: ["zitadel stop"]
+				next_commands: [publicCliCommand("stop", this.meta.cliVersion)]
 			}
 		});
 		await stopAndRemoveContainer(containerName);
@@ -32,8 +32,7 @@ var Stop = class Stop extends BaseCommand {
 					container_name: containerName,
 					data_preserved: true,
 					data_dir: runtime?.data_dir
-				},
-				next_commands: ["zitadel start", "zitadel reset --force"]
+				}
 			}
 		});
 	}

package/dist/commands/stop.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"stop.mjs","names":[],"sources":["../../src/commands/stop.ts"],"sourcesContent":["import { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport { stopAndRemoveContainer } from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_URL,\n  localContainerName,\n  readRuntimeMetadata,\n} from \"../lib/local-server/runtime\";\n\nexport default class Stop extends BaseCommand {\n  static override description = \"Stop the local Zitadel server.\";\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Stop);\n    const runtime = await readRuntimeMetadata(flags.cwd ? String(flags.cwd) : process.cwd());\n    await this.toMeta(flags, {\n      resolveServer: false,\n      source: runtime?.server_url ?? DEFAULT_LOCAL_SERVER_URL,\n    });\n\n    const containerName = runtime?.container_name ?? localContainerName(this.meta.cwd);\n    if (this.meta.dryRun) {\n      return this.emit({\n        status: \"ok\",\n        data: {\n          title: \"Local Zitadel server stop plan.\",\n          runtime: {\n            container_name: containerName,\n            data_preserved: true,\n            data_dir: runtime?.data_dir,\n          },\n          next_commands: [\"zitadel stop\"],\n        },\n      });\n    }\n\n    await stopAndRemoveContainer(containerName);\n\n    return this.emit({\n      status: \"ok\",\n      data: {\n        title: \"Local Zitadel server stopped.\",\n        runtime: {\n          container_name: containerName,\n          data_preserved: true,\n          data_dir: runtime?.data_dir,\n        },\n        next_commands: [\"zitadel start\", \"zitadel reset --force\"],\n      },\n    });\n  }\n}\n"],"mappings":";;;AAQA,IAAqB,OAArB,MAAqB,aAAa,YAAY;CAC5C,OAAgB,cAAc;CAE9B,MAAM,MAA6B;EACjC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,KAAK;EACxC,MAAM,UAAU,MAAM,oBAAoB,MAAM,MAAM,OAAO,MAAM,IAAI,GAAG,QAAQ,KAAK,CAAC;AACxF,QAAM,KAAK,OAAO,OAAO;GACvB,eAAe;GACf,QAAQ,SAAS,cAAA;GAClB,CAAC;EAEF,MAAM,gBAAgB,SAAS,kBAAkB,mBAAmB,KAAK,KAAK,IAAI;AAClF,MAAI,KAAK,KAAK,OACZ,QAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,SAAS;KACP,gBAAgB;KAChB,gBAAgB;KAChB,UAAU,SAAS;KACpB;IACD,eAAe,CAAC,eAAe;IAChC;GACF,CAAC;AAGJ,QAAM,uBAAuB,cAAc;AAE3C,SAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,SAAS;KACP,gBAAgB;KAChB,gBAAgB;KAChB,UAAU,SAAS;KACpB;IACD,eAAe,CAAC,iBAAiB,wBAAwB;IAC1D;GACF,CAAC"}
+{"version":3,"file":"stop.mjs","names":[],"sources":["../../src/commands/stop.ts"],"sourcesContent":["import { stopAndRemoveContainer } from \"../lib/local-server/docker\";\nimport {\n  DEFAULT_LOCAL_SERVER_URL,\n  localContainerName,\n  readRuntimeMetadata,\n} from \"../lib/local-server/runtime\";\nimport { BaseCommand, type JsonEnvelope } from \"../lib/oclif\";\nimport { publicCliCommand } from \"../lib/public-cli\";\n\nexport default class Stop extends BaseCommand {\n  static override description = \"Stop the local Zitadel server.\";\n\n  async run(): Promise<JsonEnvelope> {\n    const { flags } = await this.parse(Stop);\n    const runtime = await readRuntimeMetadata(flags.cwd ? String(flags.cwd) : process.cwd());\n    await this.toMeta(flags, {\n      resolveServer: false,\n      source: runtime?.server_url ?? DEFAULT_LOCAL_SERVER_URL,\n    });\n\n    const containerName = runtime?.container_name ?? localContainerName(this.meta.cwd);\n    if (this.meta.dryRun) {\n      return this.emit({\n        status: \"ok\",\n        data: {\n          title: \"Local Zitadel server stop plan.\",\n          runtime: {\n            container_name: containerName,\n            data_preserved: true,\n            data_dir: runtime?.data_dir,\n          },\n          next_commands: [publicCliCommand(\"stop\", this.meta.cliVersion)],\n        },\n      });\n    }\n\n    await stopAndRemoveContainer(containerName);\n\n    return this.emit({\n      status: \"ok\",\n      data: {\n        title: \"Local Zitadel server stopped.\",\n        runtime: {\n          container_name: containerName,\n          data_preserved: true,\n          data_dir: runtime?.data_dir,\n        },\n      },\n    });\n  }\n}\n"],"mappings":";;;AASA,IAAqB,OAArB,MAAqB,aAAa,YAAY;CAC5C,OAAgB,cAAc;CAE9B,MAAM,MAA6B;EACjC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,KAAK;EACxC,MAAM,UAAU,MAAM,oBAAoB,MAAM,MAAM,OAAO,MAAM,IAAI,GAAG,QAAQ,KAAK,CAAC;AACxF,QAAM,KAAK,OAAO,OAAO;GACvB,eAAe;GACf,QAAQ,SAAS,cAAA;GAClB,CAAC;EAEF,MAAM,gBAAgB,SAAS,kBAAkB,mBAAmB,KAAK,KAAK,IAAI;AAClF,MAAI,KAAK,KAAK,OACZ,QAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,SAAS;KACP,gBAAgB;KAChB,gBAAgB;KAChB,UAAU,SAAS;KACpB;IACD,eAAe,CAAC,iBAAiB,QAAQ,KAAK,KAAK,WAAW,CAAC;IAChE;GACF,CAAC;AAGJ,QAAM,uBAAuB,cAAc;AAE3C,SAAO,KAAK,KAAK;GACf,QAAQ;GACR,MAAM;IACJ,OAAO;IACP,SAAS;KACP,gBAAgB;KAChB,gBAAgB;KAChB,UAAU,SAAS;KACpB;IACF;GACF,CAAC"}

package/dist/{docker-C0aVpJqm.mjs → docker-DrOBycgG.mjs}

@@ -1,4 +1,4 @@
-import { T as ZitadelError, a as CONTAINER_HTTP_PORT, i as CONTAINER_DATA_DIR } from "./oclif-DSPO9Sck.mjs";
+import { E as ZitadelError, i as CONTAINER_HTTP_PORT, r as CONTAINER_DATA_DIR } from "./oclif-CqkWBQ7i.mjs";
 import { spawn } from "node:child_process";
 //#region src/lib/local-server/docker.ts
 function dockerRunArgs(spec) {
@@ -116,18 +116,19 @@ async function inspectContainer(containerName) {
 	const result = await runDocker([
 		"inspect",
 		"--format",
-		"{{.Id}} {{.State.Running}}",
+		"{{.Id}} {{.State.Running}} {{.Config.Image}}",
 		containerName
 	]);
 	if (result.status !== 0) return {
 		exists: false,
 		running: false
 	};
-	const [id, running] = result.stdout.trim().split(/\s+/);
+	const [id, running, ...imageParts] = result.stdout.trim().split(/\s+/);
 	return {
 		exists: true,
 		running: running === "true",
-		id
+		id,
+		image: imageParts.join(" ")
 	};
 }
 async function startContainer(spec) {
@@ -206,4 +207,4 @@ function dockerError(action, args, cause) {
 //#endregion
 export { followContainerLogs as a, metadataFromStart as c, ensureImage as i, startContainer as l, currentUser as n, imageAvailable as o, dockerAvailable as r, inspectContainer as s, containerLogs as t, stopAndRemoveContainer as u };
 
-//# sourceMappingURL=docker-C0aVpJqm.mjs.map
+//# sourceMappingURL=docker-DrOBycgG.mjs.map

package/dist/docker-DrOBycgG.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-DrOBycgG.mjs","names":[],"sources":["../src/lib/local-server/docker.ts"],"sourcesContent":["import { spawn } from \"node:child_process\";\n\nimport { ZitadelError } from \"../errors\";\nimport {\n  CONTAINER_DATA_DIR,\n  CONTAINER_HTTP_PORT,\n  type ContainerIdentity,\n  type RuntimeMetadata,\n} from \"./runtime\";\n\nexport type DockerResult = {\n  status: number;\n  stdout: string;\n  stderr: string;\n};\n\nexport type DockerRunSpec = {\n  containerName: string;\n  image: string;\n  port: number;\n  dataDir: string;\n  identity?: ContainerIdentity;\n};\n\nexport function dockerRunArgs(spec: DockerRunSpec): string[] {\n  const args = [\n    \"run\",\n    \"--detach\",\n    \"--name\",\n    spec.containerName,\n    \"--publish\",\n    `127.0.0.1:${spec.port}:${CONTAINER_HTTP_PORT}`,\n    \"--volume\",\n    `${spec.dataDir}:${CONTAINER_DATA_DIR}`,\n    \"--env\",\n    `NEXTGEN_SERVER_ADDRESS=:${CONTAINER_HTTP_PORT}`,\n    \"--env\",\n    `NEXTGEN_SERVER_DATA_DIR=${CONTAINER_DATA_DIR}`,\n  ];\n\n  if (spec.identity) {\n    args.push(\n      \"--volume\",\n      `${spec.identity.passwdFile}:/etc/passwd:ro`,\n      \"--volume\",\n      `${spec.identity.groupFile}:/etc/group:ro`,\n      \"--user\",\n      `${spec.identity.uid}:${spec.identity.gid}`,\n    );\n  }\n\n  args.push(spec.image);\n  return args;\n}\n\nexport async function runDocker(args: string[]): Promise<DockerResult> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(\"docker\", args, {\n      stdio: [\"ignore\", \"pipe\", \"pipe\"],\n      env: process.env,\n    });\n    let stdout = \"\";\n    let stderr = \"\";\n    child.stdout?.setEncoding(\"utf8\");\n    child.stderr?.setEncoding(\"utf8\");\n    child.stdout?.on(\"data\", (chunk: string) => {\n      stdout += chunk;\n    });\n    child.stderr?.on(\"data\", (chunk: string) => {\n      stderr += chunk;\n    });\n    child.on(\"error\", reject);\n    child.on(\"close\", (code) => {\n      resolve({ status: code ?? 1, stdout, stderr });\n    });\n  });\n}\n\nexport async function streamDocker(args: string[]): Promise<void> {\n  await new Promise<void>((resolve, reject) => {\n    const child = spawn(\"docker\", args, {\n      stdio: \"inherit\",\n      env: process.env,\n    });\n    child.on(\"error\", reject);\n    child.on(\"close\", (code) => {\n      if (code === 0) {\n        resolve();\n      } else {\n        reject(new Error(`docker ${args.join(\" \")} exited with status ${code ?? 1}`));\n      }\n    });\n  });\n}\n\nexport async function dockerAvailable(): Promise<DockerResult> {\n  return runDocker([\"version\", \"--format\", \"{{.Server.Version}}\"]);\n}\n\nexport async function pullImage(image: string): Promise<void> {\n  await requireDocker([\"pull\", \"--quiet\", image], `Pull Docker image ${image}`);\n}\n\nexport async function imageExists(image: string): Promise<boolean> {\n  let result: DockerResult;\n  const args = [\"image\", \"inspect\", image];\n  try {\n    result = await runDocker(args);\n  } catch (error) {\n    throw dockerError(`Inspect Docker image ${image}`, args, error);\n  }\n  return result.status === 0;\n}\n\nexport async function imageAvailable(image: string): Promise<\"local\" | \"remote\"> {\n  if (await imageExists(image)) {\n    return \"local\";\n  }\n\n  const args = [\"manifest\", \"inspect\", image];\n  let result: DockerResult;\n  try {\n    result = await runDocker(args);\n  } catch (error) {\n    throw dockerError(`Inspect Docker image ${image}`, args, error);\n  }\n  if (result.status === 0) {\n    return \"remote\";\n  }\n  throw dockerError(`Inspect Docker image ${image}`, args, result);\n}\n\nexport async function ensureImage(image: string): Promise<\"local\" | \"pulled\"> {\n  if (await imageExists(image)) {\n    return \"local\";\n  }\n  await pullImage(image);\n  return \"pulled\";\n}\n\nexport async function inspectContainer(containerName: string): Promise<{\n  exists: boolean;\n  running: boolean;\n  id?: string;\n  image?: string;\n}> {\n  const result = await runDocker([\n    \"inspect\",\n    \"--format\",\n    \"{{.Id}} {{.State.Running}} {{.Config.Image}}\",\n    containerName,\n  ]);\n  if (result.status !== 0) {\n    return { exists: false, running: false };\n  }\n  const [id, running, ...imageParts] = result.stdout.trim().split(/\\s+/);\n  return { exists: true, running: running === \"true\", id, image: imageParts.join(\" \") };\n}\n\nexport async function startContainer(spec: DockerRunSpec): Promise<string> {\n  const args = dockerRunArgs(spec);\n  const result = await requireDocker(args, \"Start local Zitadel container\");\n  return result.stdout.trim();\n}\n\nexport async function stopAndRemoveContainer(containerName: string): Promise<void> {\n  const inspect = await inspectContainer(containerName);\n  if (!inspect.exists) {\n    return;\n  }\n  if (inspect.running) {\n    await requireDocker([\"stop\", containerName], `Stop ${containerName}`);\n  }\n  await requireDocker([\"rm\", containerName], `Remove ${containerName}`);\n}\n\nexport async function containerLogs(containerName: string, tail: number): Promise<string> {\n  const result = await requireDocker([\"logs\", \"--tail\", String(tail), containerName], \"Read logs\");\n  return result.stdout;\n}\n\nexport async function followContainerLogs(containerName: string, tail: number): Promise<void> {\n  await streamDocker([\"logs\", \"--tail\", String(tail), \"--follow\", containerName]);\n}\n\nexport function currentUser(): { uid?: number; gid?: number } {\n  const getuid = process.getuid;\n  const getgid = process.getgid;\n  if (typeof getuid !== \"function\") {\n    return {};\n  }\n  const uid = getuid();\n  const gid = typeof getgid === \"function\" ? getgid() : uid;\n  return { uid, gid };\n}\n\nexport function metadataFromStart(input: {\n  cwdDataDir: string;\n  cliVersion: string;\n  containerName: string;\n  containerId: string;\n  image: string;\n  port: number;\n  serverUrl: string;\n}): RuntimeMetadata {\n  return {\n    schema_version: 1,\n    container_name: input.containerName,\n    container_id: input.containerId,\n    image: input.image,\n    port: input.port,\n    server_url: input.serverUrl,\n    data_dir: input.cwdDataDir,\n    created_at: new Date().toISOString(),\n    cli_version: input.cliVersion,\n  };\n}\n\nexport async function requireDocker(args: string[], action: string): Promise<DockerResult> {\n  let result: DockerResult;\n  try {\n    result = await runDocker(args);\n  } catch (error) {\n    throw dockerError(action, args, error);\n  }\n  if (result.status !== 0) {\n    throw dockerError(action, args, result);\n  }\n  return result;\n}\n\nfunction dockerError(action: string, args: string[], cause: unknown): ZitadelError {\n  const details =\n    cause && typeof cause === \"object\" && \"stderr\" in cause\n      ? { command: [\"docker\", ...args], stderr: String((cause as { stderr?: unknown }).stderr) }\n      : { command: [\"docker\", ...args], cause };\n  return new ZitadelError(\"E_VALIDATION\", `${action} failed`, {\n    hint: \"Check that Docker is installed, running, and reachable from this shell.\",\n    nextCommands: [\"zitadel doctor\"],\n    details,\n  });\n}\n"],"mappings":"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"}

package/dist/{oclif-DSPO9Sck.mjs → oclif-CqkWBQ7i.mjs}

@@ -1,12 +1,12 @@
 import { Command, Flags } from "@oclif/core";
 import consola from "consola";
-import { access, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { join, resolve } from "node:path";
 import { ApiError } from "@zitadel/api/runtime/fetch";
+import { stringify } from "safe-stable-stringify";
+import { join, resolve } from "node:path";
+import { access, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { constants } from "node:fs";
 import { createServer } from "node:net";
-import { stringify } from "safe-stable-stringify";
 //#region src/lib/errors.ts
 /**
 * Maps each {@link ZitadelErrorCode} to the process exit code the CLI
@@ -148,8 +148,50 @@ function isObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
+//#region src/lib/paths.ts
+/**
+* Resolve the working directory the CLI should operate against, defaulting to
+* the process CWD when no `--cwd` override is given. Always returns an
+* absolute path so downstream `join`/`readFile` calls are unaffected by later
+* `process.chdir` or relative-path ambiguity.
+*/
+function resolveCwd(cwd) {
+	return resolve(cwd ?? process.cwd());
+}
+/**
+* Sentinel comment stamped at the top of every file the CLI generates and
+* owns. Commands like `doctor` and `eject` look for this marker to decide
+* whether a file is safe to touch; the trailing `v1` lets the format evolve
+* without mistaking newer managed files for hand-edited ones.
+*/
+const MANAGED_MARKER = "// zitadel-cli: managed-file v1";
+//#endregion
+//#region src/lib/public-cli.ts
+const CLI_PACKAGE_NAME = "@zitadel/cli";
+function npmDistTagForCliVersion(cliVersion) {
+	return cliVersion.trim().replace(/^v/, "").match(/^\d+\.\d+\.\d+-([0-9A-Za-z][0-9A-Za-z-]*)/)?.[1] ?? "latest";
+}
+function npmSelectorForCliVersion(cliVersion) {
+	const normalized = cliVersion.trim().replace(/^v/, "");
+	if (/^\d+\.\d+\.\d+-alpha\.\d+$/.test(normalized)) return normalized;
+	return npmDistTagForCliVersion(normalized);
+}
+function publicCliCommand(args, cliVersion) {
+	const prefix = `npx ${CLI_PACKAGE_NAME}@${npmSelectorForCliVersion(cliVersion)}`;
+	return args.length > 0 ? `${prefix} ${args}` : prefix;
+}
+function normalizePublicCliCommand(command, cliVersion) {
+	if (command === "zitadel") return publicCliCommand("", cliVersion);
+	if (command.startsWith("zitadel ")) return publicCliCommand(command.slice(8), cliVersion);
+	return command;
+}
+function normalizePublicCliCommands(commands, cliVersion) {
+	return commands?.map((command) => normalizePublicCliCommand(command, cliVersion));
+}
+//#endregion
 //#region src/lib/local-server/runtime.ts
-const DEFAULT_LOCAL_SERVER_IMAGE = "ghcr.io/zitadel/nextgen:latest";
+const LOCAL_SERVER_IMAGE_NAME = "ghcr.io/zitadel/nextgen";
+const DEFAULT_LOCAL_SERVER_IMAGE = `${LOCAL_SERVER_IMAGE_NAME}:latest`;
 const DEFAULT_LOCAL_SERVER_PORT = 8080;
 const DEFAULT_LOCAL_SERVER_URL = "http://localhost:8080";
 const LOCAL_RUNTIME_DIR = ".zitadel/local";
@@ -174,6 +216,11 @@ function localContainerName(cwd) {
 function localServerUrl(port) {
 	return `http://localhost:${port}`;
 }
+function defaultLocalServerImageForCliVersion(cliVersion) {
+	const normalized = cliVersion.trim().replace(/^v/, "");
+	if (/^\d+\.\d+\.\d+-alpha\.\d+$/.test(normalized)) return `${LOCAL_SERVER_IMAGE_NAME}:${normalized}`;
+	return DEFAULT_LOCAL_SERVER_IMAGE;
+}
 async function ensureLocalState(cwd) {
 	const paths = localRuntimePaths(cwd);
 	await mkdir(paths.dataDir, {
@@ -422,24 +469,6 @@ function readEnvServer(config, environment) {
 	return typeof branch.server === "string" ? branch.server : void 0;
 }
 //#endregion
-//#region src/lib/paths.ts
-/**
-* Resolve the working directory the CLI should operate against, defaulting to
-* the process CWD when no `--cwd` override is given. Always returns an
-* absolute path so downstream `join`/`readFile` calls are unaffected by later
-* `process.chdir` or relative-path ambiguity.
-*/
-function resolveCwd(cwd) {
-	return resolve(cwd ?? process.cwd());
-}
-/**
-* Sentinel comment stamped at the top of every file the CLI generates and
-* owns. Commands like `doctor` and `eject` look for this marker to decide
-* whether a file is safe to touch; the trailing `v1` lets the format evolve
-* without mistaking newer managed files for hand-edited ones.
-*/
-const MANAGED_MARKER = "// zitadel-cli: managed-file v1";
-//#endregion
 //#region src/lib/oclif/base.ts
 /**
 * Base class for every oclif command. Owns the global flags, builds the
@@ -530,8 +559,9 @@ var BaseCommand = class extends Command {
 	* envelope so oclif's `--json` path serialises it.
 	*/
 	emit(result) {
-		this.log(renderPretty(result, this.meta));
-		return toEnvelope(result, this.meta);
+		const normalized = normalizeCommandResult(result, this.meta);
+		this.log(renderPretty(normalized, this.meta));
+		return toEnvelope(normalized, this.meta);
 	}
 	/**
 	* Renders any thrown error as the failure envelope and exits with its code.
@@ -546,7 +576,7 @@ var BaseCommand = class extends Command {
 		};
 		const zitadelError = toZitadelError(error);
 		if (this.jsonEnabled()) this.logJson(toErrorEnvelope(zitadelError, meta));
-		else this.logToStderr(renderError(zitadelError));
+		else this.logToStderr(renderError(zitadelError, meta));
 		return this.exit(zitadelError.exitCode);
 	}
 	/**
@@ -570,6 +600,24 @@ var BaseCommand = class extends Command {
 		};
 	}
 };
+function normalizeCommandResult(result, meta) {
+	if (result.status === "ok") return {
+		...result,
+		data: normalizeDataNextCommands(result.data, meta)
+	};
+	return {
+		...result,
+		data: normalizeDataNextCommands(result.data, meta),
+		nextCommands: normalizePublicCliCommands(result.nextCommands, meta.cliVersion)
+	};
+}
+function normalizeDataNextCommands(data, meta) {
+	if (!isObject(data) || !Array.isArray(data.next_commands)) return data;
+	return {
+		...data,
+		next_commands: data.next_commands.map((command) => typeof command === "string" ? normalizePublicCliCommand(command, meta.cliVersion) : command)
+	};
+}
 /** Wraps a {@link CommandResult} with the invocation metadata into the final envelope. */
 function toEnvelope(result, meta) {
 	const base = {
@@ -601,7 +649,7 @@ function toErrorEnvelope(error, meta) {
 		code: error.code,
 		message: error.message,
 		hint: error.hint,
-		next_commands: error.nextCommands,
+		next_commands: normalizePublicCliCommands(error.nextCommands, meta.cliVersion),
 		details: error.details
 	};
 }
@@ -625,12 +673,13 @@ function renderPretty(result, meta) {
 * Renders a {@link ZitadelError} as a human-readable block for stderr: the
 * coded message, an optional hint, and any suggested next commands.
 */
-function renderError(error) {
+function renderError(error, meta) {
 	const lines = [`Error ${error.code}: ${error.message}`];
 	if (error.hint) lines.push(error.hint);
-	if (error.nextCommands && error.nextCommands.length > 0) {
+	const nextCommands = normalizePublicCliCommands(error.nextCommands, meta.cliVersion);
+	if (nextCommands && nextCommands.length > 0) {
 		lines.push("Next:");
-		for (const cmd of error.nextCommands) lines.push(`  $ ${cmd}`);
+		for (const cmd of nextCommands) lines.push(`  $ ${cmd}`);
 	}
 	return lines.join("\n");
 }
@@ -659,9 +708,16 @@ function formatData(data, warnings, opts) {
 			for (const cmd of data.next_commands) lines.push(`  $ ${String(cmd)}`);
 		}
 	}
-	for (const warning of warnings) lines.push(`Warning: ${warning}`);
+	for (const warning of warnings.filter((warning) => !warningRenderedInChecks(data, warning))) lines.push(`Warning: ${warning}`);
 	return lines.join("\n");
 }
+function warningRenderedInChecks(data, warning) {
+	if (!isObject(data) || !Array.isArray(data.checks)) return false;
+	return data.checks.some((check) => {
+		if (!isObject(check) || check.status !== "warn") return false;
+		return warning === `${String(check.name ?? "check")}: ${String(check.message ?? "")}`;
+	});
+}
 function renderKnownSections(lines, data) {
 	if (isObject(data.project)) {
 		const project = data.project;
@@ -689,7 +745,7 @@ function renderKnownSections(lines, data) {
 		lines.push("Checks:");
 		for (const check of data.checks) {
 			if (!isObject(check)) continue;
-			const status = check.status === "pass" ? "ok" : "fail";
+			const status = check.status === "pass" ? "ok" : check.status === "warn" ? "warn" : "fail";
 			lines.push(`  [${status}] ${String(check.name ?? "check")}: ${String(check.message ?? "")}`);
 		}
 	}
@@ -708,6 +764,6 @@ function suffixBlock(opts) {
 	return suffix ? ` ${suffix}` : "";
 }
 //#endregion
-export { parseJsonObject as C, isObject as S, ZitadelError as T, readRuntimeMetadata as _, CONTAINER_HTTP_PORT as a, runtimeSummary as b, DEFAULT_LOCAL_SERVER_URL as c, ensureContainerIdentity as d, ensureLocalState as f, localServerUrl as g, localRuntimePaths as h, CONTAINER_DATA_DIR as i, assertWritableDirectory as l, localContainerName as m, MANAGED_MARKER as n, DEFAULT_LOCAL_SERVER_IMAGE as o, isPortAvailable as p, DEFAULT_SERVER as r, DEFAULT_LOCAL_SERVER_PORT as s, BaseCommand as t, checkLocalServerHealth as u, removeLocalData as v, stableStringify as w, writeRuntimeMetadata as x, removeRuntimeMetadata as y };
+export { isObject as C, ZitadelError as E, MANAGED_MARKER as S, stableStringify as T, removeLocalData as _, DEFAULT_LOCAL_SERVER_PORT as a, writeRuntimeMetadata as b, checkLocalServerHealth as c, ensureLocalState as d, isPortAvailable as f, readRuntimeMetadata as g, localServerUrl as h, CONTAINER_HTTP_PORT as i, defaultLocalServerImageForCliVersion as l, localRuntimePaths as m, DEFAULT_SERVER as n, DEFAULT_LOCAL_SERVER_URL as o, localContainerName as p, CONTAINER_DATA_DIR as r, assertWritableDirectory as s, BaseCommand as t, ensureContainerIdentity as u, removeRuntimeMetadata as v, parseJsonObject as w, publicCliCommand as x, runtimeSummary as y };
 
-//# sourceMappingURL=oclif-DSPO9Sck.mjs.map
+//# sourceMappingURL=oclif-CqkWBQ7i.mjs.map