fix: address journey runner review comments

Author: fforootd

apps/cli-journey-e2e/scripts/prepare-next-app.mjs

@@ -179,7 +179,7 @@ async function collectLocalRuntimeLogs(input) {
   } catch (error) {
     await input.writeFile(
       join(input.outputDir, "logs.stderr.log"),
-      `failed to collect local runtime logs: ${error.message}\n`,
+      `failed to collect local runtime logs: ${errorMessage(error)}\n`,
     );
     return;
   }
@@ -262,7 +262,11 @@ if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.ur
   try {
     await prepareNextApp();
   } catch (error) {
-    console.error(error instanceof Error ? error.message : String(error));
+    console.error(errorMessage(error));
     process.exit(1);
   }
 }
+
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}

apps/cli-journey-e2e/scripts/prepare-next-app.test.mjs

@@ -138,6 +138,47 @@ test("collects local runtime logs when a CLI step fails", async () => {
   }
 });
 
+test("records log collection failures thrown as non-Error values", async () => {
+  const workDir = await mkdtemp(join(tmpdir(), "zitadel-journey-prepare-non-error-test-"));
+
+  try {
+    await assert.rejects(
+      prepareNextApp({
+        env: {
+          JOURNEY_CLI_PACKAGE: "@zitadel/cli",
+          JOURNEY_SDK_NEXT_PACKAGE: "@zitadel/sdk-next",
+          JOURNEY_WORK_DIR: workDir,
+        },
+        logMetadata: false,
+        runCapture: async (command, args) => {
+          if (args.includes("doctor")) {
+            return { code: 0, stdout: `${JSON.stringify(okEnvelope(args))}\n`, stderr: "" };
+          }
+          if (args.includes("start")) {
+            return {
+              code: 1,
+              stdout: `${JSON.stringify({ status: "error", message: "boom" })}\n`,
+              stderr: "start failed",
+            };
+          }
+          if (args.includes("logs")) {
+            throw null;
+          }
+          throw new Error(`unexpected command: ${command} ${args.join(" ")}`);
+        },
+      }),
+      /start exited 1/,
+    );
+
+    assert.equal(
+      await readFile(join(workDir, "logs.stderr.log"), "utf8"),
+      "failed to collect local runtime logs: null\n",
+    );
+  } finally {
+    await rm(workDir, { recursive: true, force: true });
+  }
+});
+
 async function writeGeneratedApp(appDir, registryUrl) {
   await writeFile(
     join(appDir, "package.json"),

apps/cli-journey-e2e/scripts/run-local.mjs

@@ -29,7 +29,7 @@ const packageDirs = [
   "packages/sdk-angular",
 ];
 
-const options = parseArgs(process.argv.slice(2));
+const options = parseArgsOrExit(process.argv.slice(2));
 const workDir = resolve(
   options.workDir || (await mkdtemp(join(tmpdir(), "zitadel-cli-journey-local-"))),
 );
@@ -150,7 +150,7 @@ try {
 } catch (error) {
   await collectDiagnostics();
   console.error("");
-  console.error(`[journey-local] failed: ${error.message}`);
+  console.error(`[journey-local] failed: ${errorMessage(error)}`);
   console.error(`[journey-local] diagnostics preserved in ${workDir}`);
   process.exitCode = 1;
 } finally {
@@ -164,6 +164,15 @@ try {
 
 process.exit(process.exitCode ?? 0);
 
+function parseArgsOrExit(args) {
+  try {
+    return parseArgs(args);
+  } catch (error) {
+    console.error(`[journey-local] ${errorMessage(error)}`);
+    process.exit(1);
+  }
+}
+
 function parseArgs(args) {
   const parsed = {
     image: "",
@@ -175,11 +184,14 @@ function parseArgs(args) {
     const arg = args[index];
     switch (arg) {
       case "--backend": {
-        const backend = readValue(args, ++index, arg);
-        if (!["source", "image"].includes(backend)) {
-          throw new Error(`--backend must be "source" or "image", got ${backend}`);
-        }
-        break;
+        readValue(args, ++index, arg);
+        throw new Error(
+          [
+            "--backend was removed from the journey runner.",
+            "The journey now always exercises `npx @zitadel/cli@alpha start`.",
+            "Remove `--backend`, or pass `--image <docker-tag>` / set ZITADEL_LOCAL_IMAGE to choose the local runtime image.",
+          ].join(" "),
+        );
       }
       case "--image": {
         parsed.image = readValue(args, ++index, arg);
@@ -501,7 +513,7 @@ function runCapture(command, args, optionsForRun = {}) {
 }
 
 function commandErrorDetail(error) {
-  const message = error instanceof Error ? error.message : String(error);
+  const message = errorMessage(error);
   const lines = message
     .split(/\r?\n/)
     .map((line) => line.trim())
@@ -541,7 +553,7 @@ async function collectDiagnostics() {
       );
       await writeFile(composeLogPath, `${result.stdout}${result.stderr}`);
     } catch (error) {
-      await writeFile(composeLogPath, `failed to collect compose logs: ${error.message}\n`);
+      await writeFile(composeLogPath, `failed to collect compose logs: ${errorMessage(error)}\n`);
     }
   }
 
@@ -594,7 +606,7 @@ async function collectLocalRuntimeLogs() {
   } catch (error) {
     await writeFile(
       join(diagnosticsDir, "logs.stderr.log"),
-      `failed to collect local runtime logs: ${error.message}\n`,
+      `failed to collect local runtime logs: ${errorMessage(error)}\n`,
     );
   }
 }
@@ -623,7 +635,7 @@ async function cleanup() {
     try {
       await run("docker", composeArgs(["down", "-v", "--remove-orphans"]));
     } catch (error) {
-      console.error(`[journey-local] docker compose cleanup failed: ${error.message}`);
+      console.error(`[journey-local] docker compose cleanup failed: ${errorMessage(error)}`);
     }
   }
 }
@@ -636,7 +648,7 @@ async function resetLocalRuntime() {
       { cwd: appDir, env: npxEnv() },
     );
   } catch (error) {
-    console.error(`[journey-local] local runtime reset failed: ${error.message}`);
+    console.error(`[journey-local] local runtime reset failed: ${errorMessage(error)}`);
   }
 }
 
@@ -702,3 +714,7 @@ function npxEnv() {
 function log(message) {
   console.log(`[journey-local] ${message}`);
 }
+
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}