diff --git a/cli/package.json b/cli/package.json
index e381f009..d1057c92 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openrouter/spawn",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "type": "module",
   "bin": {
     "spawn": "cli.js"
diff --git a/cli/src/aws/aws.ts b/cli/src/aws/aws.ts
index 7ce4fb5a..1183eabc 100644
--- a/cli/src/aws/aws.ts
+++ b/cli/src/aws/aws.ts
@@ -813,12 +813,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`AWS instance name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/daytona/daytona.ts b/cli/src/daytona/daytona.ts
index 91d692b4..23d74bad 100644
--- a/cli/src/daytona/daytona.ts
+++ b/cli/src/daytona/daytona.ts
@@ -527,12 +527,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`Daytona workspace name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/digitalocean/digitalocean.ts b/cli/src/digitalocean/digitalocean.ts
index aff09129..bae3eede 100644
--- a/cli/src/digitalocean/digitalocean.ts
+++ b/cli/src/digitalocean/digitalocean.ts
@@ -953,12 +953,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`DigitalOcean droplet name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/fly/fly.ts b/cli/src/fly/fly.ts
index 33c2b0cd..9cd2df15 100644
--- a/cli/src/fly/fly.ts
+++ b/cli/src/fly/fly.ts
@@ -918,12 +918,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`Fly machine name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/gcp/gcp.ts b/cli/src/gcp/gcp.ts
index 82f54637..12b975af 100644
--- a/cli/src/gcp/gcp.ts
+++ b/cli/src/gcp/gcp.ts
@@ -387,12 +387,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`GCP instance name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/hetzner/hetzner.ts b/cli/src/hetzner/hetzner.ts
index 86e56e30..f0c8973d 100644
--- a/cli/src/hetzner/hetzner.ts
+++ b/cli/src/hetzner/hetzner.ts
@@ -584,12 +584,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`Hetzner server name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();
diff --git a/cli/src/sprite/sprite.ts b/cli/src/sprite/sprite.ts
index dcaacb6f..9328e1d6 100644
--- a/cli/src/sprite/sprite.ts
+++ b/cli/src/sprite/sprite.ts
@@ -195,12 +195,11 @@ export async function promptSpawnName(): Promise<void> {
   if (process.env.SPAWN_NAME_KEBAB) return;
 
   let kebab: string;
-  if (process.env.SPAWN_NAME) {
-    kebab = toKebabCase(process.env.SPAWN_NAME) || defaultSpawnName();
-  } else if (process.env.SPAWN_NON_INTERACTIVE === "1") {
-    kebab = defaultSpawnName();
+  if (process.env.SPAWN_NON_INTERACTIVE === "1") {
+    kebab = (process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "") || defaultSpawnName();
   } else {
-    const fallback = defaultSpawnName();
+    const derived = process.env.SPAWN_NAME ? toKebabCase(process.env.SPAWN_NAME) : "";
+    const fallback = derived || defaultSpawnName();
     process.stderr.write("\n");
     const answer = await prompt(`Sprite name [${fallback}]: `);
     kebab = toKebabCase(answer || fallback) || defaultSpawnName();