mlclaw 0.1.0 → 0.2.2

package/dist/mlclaw.mjs

@@ -9756,10 +9756,10 @@ function parseGatewayLocation(value) {
 
 // src/mlclaw/git.ts
 import { execFile as execFile2 } from "node:child_process";
-import fs11 from "node:fs/promises";
+import fs12 from "node:fs/promises";
 import os4 from "node:os";
-import path12 from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import path13 from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { promisify as promisify2 } from "node:util";
 
 // src/vendor/hfjs-xet/error.ts
@@ -14549,6 +14549,17 @@ var HubApi = class {
       throw err;
     }
   }
+  async bucketExists(bucketId) {
+    try {
+      await this.bucket(bucketId).assertBucketAccessible();
+      return true;
+    } catch (err) {
+      if (err instanceof BucketHttpError && err.status === 404) {
+        return false;
+      }
+      throw err;
+    }
+  }
   async createDockerSpace(repoId, options) {
     const [owner, name] = splitRepoId(repoId);
     const me2 = await this.whoami();
@@ -14578,6 +14589,17 @@ var HubApi = class {
       throw err;
     }
   }
+  async spaceExists(repoId) {
+    try {
+      await this.requestJson(`/api/spaces/${repoId}`);
+      return true;
+    } catch (err) {
+      if (err instanceof HubApiError2 && err.status === 404) {
+        return false;
+      }
+      throw err;
+    }
+  }
   async addSpaceVariable(repoId, key, value) {
     await this.requestJson(`/api/spaces/${repoId}/variables`, {
       method: "POST",
@@ -14778,15 +14800,73 @@ function sseDataToText(raw) {
   return lines.join("");
 }
 
+// src/mlclaw/runtime-image.ts
+import fs11 from "node:fs";
+import path12 from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var DEFAULT_OPENCLAW_VERSION = "2026.7.1-beta.2";
+var DEFAULT_RUNTIME_IMAGE_REPOSITORY = "ghcr.io/osolmaz/mlclaw";
+var PACKAGE_METADATA = readPackageMetadata();
+var PACKAGE_VERSION = packageString("version", "unknown");
+var OPENCLAW_VERSION = packageConfigString("openclawVersion", DEFAULT_OPENCLAW_VERSION);
+var OPENCLAW_BASE_IMAGE = `ghcr.io/openclaw/openclaw:${OPENCLAW_VERSION}`;
+var RUNTIME_IMAGE_REPOSITORY = packageConfigString("runtimeImageRepository", DEFAULT_RUNTIME_IMAGE_REPOSITORY);
+var DEFAULT_RUNTIME_IMAGE_TAG = `${PACKAGE_VERSION}-openclaw-${OPENCLAW_VERSION}`;
+var DEFAULT_RUNTIME_IMAGE = `${RUNTIME_IMAGE_REPOSITORY}:${DEFAULT_RUNTIME_IMAGE_TAG}`;
+function resolveRuntimeImage(value, env = process.env) {
+  return value?.trim() || env.MLCLAW_RUNTIME_IMAGE?.trim() || DEFAULT_RUNTIME_IMAGE;
+}
+function resolveSpaceRuntimeImage(opts, env = process.env) {
+  if (opts.bundledRuntime) {
+    if (opts.runtimeImage?.trim() || env.MLCLAW_RUNTIME_IMAGE?.trim()) {
+      throw new Error("--bundled-runtime cannot be combined with --runtime-image or MLCLAW_RUNTIME_IMAGE");
+    }
+    return void 0;
+  }
+  return resolveRuntimeImage(opts.runtimeImage, env);
+}
+function bundledSpaceRuntimeRef(templateRev) {
+  return `bundled:${templateRev}`;
+}
+function packageString(key, fallback) {
+  const value = PACKAGE_METADATA[key];
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+function packageConfigString(key, fallback) {
+  const value = PACKAGE_METADATA.config?.[key];
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+function readPackageMetadata() {
+  let dir = path12.dirname(fileURLToPath2(import.meta.url));
+  while (true) {
+    const candidate = path12.join(dir, "package.json");
+    try {
+      return JSON.parse(fs11.readFileSync(candidate, "utf8"));
+    } catch (err) {
+      if (!isMissingFileError(err)) {
+        throw err;
+      }
+    }
+    const parent = path12.dirname(dir);
+    if (parent === dir) {
+      throw new Error("could not find package.json while resolving default runtime image");
+    }
+    dir = parent;
+  }
+}
+function isMissingFileError(err) {
+  return err instanceof Error && "code" in err && err.code === "ENOENT";
+}
+
 // src/mlclaw/git.ts
 var execFileAsync2 = promisify2(execFile2);
 async function pushTemplateToSpace(params) {
-  const tempRoot = await fs11.mkdtemp(path12.join(os4.tmpdir(), "mlclaw-space-"));
+  const tempRoot = await fs12.mkdtemp(path13.join(os4.tmpdir(), "mlclaw-space-"));
   try {
     const sourceDir = params.sourceDir ?? process.env.MLCLAW_SOURCE_DIR ?? await findPackagedSourceRoot();
     const templateRev = await currentTemplateRev(sourceDir);
-    const outDir = path12.join(tempRoot, "space");
-    await fs11.mkdir(outDir, { recursive: true });
+    const outDir = path13.join(tempRoot, "space");
+    await fs12.mkdir(outDir, { recursive: true });
     await generateSpaceRepo(sourceDir, outDir, {
       ...params.runtimeImage ? { runtimeImage: params.runtimeImage } : {}
     });
@@ -14804,7 +14884,7 @@ async function pushTemplateToSpace(params) {
     });
     return { templateRev };
   } finally {
-    await fs11.rm(tempRoot, { recursive: true, force: true });
+    await fs12.rm(tempRoot, { recursive: true, force: true });
   }
 }
 async function currentTemplateRev(sourceDir) {
@@ -14817,18 +14897,22 @@ async function currentTemplateRev(sourceDir) {
     }
   } catch {
   }
-  const pkg = JSON.parse(await fs11.readFile(path12.join(sourceDir, "package.json"), "utf8"));
+  const pkg = JSON.parse(await fs12.readFile(path13.join(sourceDir, "package.json"), "utf8"));
   return `npm:${pkg.name ?? "mlclaw"}@${pkg.version ?? "unknown"}`;
 }
 async function generateSpaceRepo(sourceDir, outDir, options = {}) {
   const copies = [
     [".gitattributes", ".gitattributes"],
+    ["assets/hf-logo.svg", "assets/hf-logo.svg"],
     ["assets/mlclaw.svg", "assets/mlclaw.svg"],
+    ["assets/mlclaw-control-ui", "assets/mlclaw-control-ui"],
+    ["assets/hf-tooling", "assets/hf-tooling"],
     ["space/README.md", "README.md"]
   ];
   if (!options.runtimeImage) {
     copies.push(
       ["dist/hf-state-sync.js", "runtime/hf-state-sync.js"],
+      ["dist/hf-tooling-seed.js", "runtime/hf-tooling-seed.js"],
       ["dist/mlclaw-space-runtime.js", "runtime/mlclaw-space-runtime.js"],
       ["entrypoint.sh", "runtime/entrypoint.sh"],
       ["openclaw.default.json", "runtime/openclaw.default.json"],
@@ -14838,10 +14922,10 @@ async function generateSpaceRepo(sourceDir, outDir, options = {}) {
     );
   }
   for (const [from, to] of copies) {
-    await copyExisting(path12.join(sourceDir, from), path12.join(outDir, to));
+    await copyExisting(path13.join(sourceDir, from), path13.join(outDir, to));
   }
-  await fs11.writeFile(
-    path12.join(outDir, "Dockerfile"),
+  await fs12.writeFile(
+    path13.join(outDir, "Dockerfile"),
     options.runtimeImage ? imageDockerfile(options.runtimeImage) : bundledDockerfile(),
     "utf8"
   );
@@ -14851,17 +14935,30 @@ function imageDockerfile(runtimeImage) {
 `;
 }
 function bundledDockerfile() {
-  return `FROM ghcr.io/openclaw/openclaw:latest
+  return `FROM ${OPENCLAW_BASE_IMAGE}
 
 LABEL org.opencontainers.image.source="https://github.com/osolmaz/mlclaw"
 LABEL org.opencontainers.image.description="ML Claw runtime for OpenClaw on Hugging Face"
 
 USER root
 RUN apt-get update \\
-  && apt-get install -y --no-install-recommends gosu zstd \\
+  && apt-get install -y --no-install-recommends gosu python3 python3-pip python3-venv zstd \\
   && rm -rf /var/lib/apt/lists/*
+RUN python3 -m pip install --break-system-packages --no-cache-dir \\
+  "huggingface_hub==1.19.0" \\
+  "datasets==5.0.0" \\
+  "safetensors==0.8.0" \\
+  "fastapi==0.137.1" \\
+  "pydantic==2.13.4" \\
+  "rich==15.0.0" \\
+  "starlette==1.3.1" \\
+  "typer==0.25.1" \\
+  "uvicorn==0.49.0" \\
+  "uv==0.11.28" \\
+  "hf-discover==1.3.7"
 
 COPY --chown=node:node runtime/hf-state-sync.js /app/hf-state-sync.js
+COPY --chown=node:node runtime/hf-tooling-seed.js /app/hf-tooling-seed.js
 COPY --chown=node:node runtime/mlclaw-space-runtime.js /app/mlclaw-space-runtime.js
 COPY --chown=node:node runtime/openclaw.default.json /app/openclaw.default.json
 COPY --chown=node:node runtime/entrypoint.sh /app/entrypoint.sh
@@ -14886,13 +14983,13 @@ CMD ["/app/entrypoint.sh"]
 `;
 }
 async function findPackagedSourceRoot() {
-  const start = path12.dirname(fileURLToPath2(import.meta.url));
+  const start = path13.dirname(fileURLToPath3(import.meta.url));
   let dir = start;
   while (true) {
     if (await hasPackagedSourceFiles(dir)) {
       return dir;
     }
-    const parent = path12.dirname(dir);
+    const parent = path13.dirname(dir);
     if (parent === dir) {
       throw new Error("Could not find packaged ML Claw source files. Reinstall the mlclaw npm package.");
     }
@@ -14909,20 +15006,20 @@ async function hasPackagedSourceFiles(dir) {
     "src/hf-bucket-client/client.ts"
   ];
   try {
-    await Promise.all(required.map((file) => fs11.access(path12.join(dir, file))));
+    await Promise.all(required.map((file) => fs12.access(path13.join(dir, file))));
     return true;
   } catch {
     return false;
   }
 }
 async function copyExisting(from, to) {
-  const stat = await fs11.stat(from);
-  await fs11.mkdir(path12.dirname(to), { recursive: true });
+  const stat = await fs12.stat(from);
+  await fs12.mkdir(path13.dirname(to), { recursive: true });
   if (stat.isDirectory()) {
-    await fs11.cp(from, to, { recursive: true });
+    await fs12.cp(from, to, { recursive: true });
   } else {
-    await fs11.copyFile(from, to);
-    await fs11.chmod(to, stat.mode);
+    await fs12.copyFile(from, to);
+    await fs12.chmod(to, stat.mode);
   }
 }
 async function readFilesForCommit(root) {
@@ -14930,24 +15027,24 @@ async function readFilesForCommit(root) {
   for (const relativePath of await listFiles(root)) {
     files.push({
       path: relativePath,
-      content: await fs11.readFile(path12.join(root, relativePath))
+      content: await fs12.readFile(path13.join(root, relativePath))
     });
   }
   return files;
 }
 async function listFiles(root, dir = "") {
-  const absoluteDir = path12.join(root, dir);
-  const entries = await fs11.readdir(absoluteDir, { withFileTypes: true });
+  const absoluteDir = path13.join(root, dir);
+  const entries = await fs12.readdir(absoluteDir, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
-    const relativePath = path12.posix.join(dir.split(path12.sep).join(path12.posix.sep), entry.name);
-    const absolutePath = path12.join(root, relativePath);
+    const relativePath = path13.posix.join(dir.split(path13.sep).join(path13.posix.sep), entry.name);
+    const absolutePath = path13.join(root, relativePath);
     if (entry.isDirectory()) {
       files.push(...await listFiles(root, relativePath));
     } else if (entry.isFile()) {
       files.push(relativePath);
     } else {
-      const stat = await fs11.stat(absolutePath);
+      const stat = await fs12.stat(absolutePath);
       if (stat.isFile()) {
         files.push(relativePath);
       }
@@ -15014,9 +15111,9 @@ async function assertNoLiveForeignLease(params) {
 }
 
 // src/mlclaw/local-config.ts
-import fs12 from "node:fs/promises";
+import fs13 from "node:fs/promises";
 import os5 from "node:os";
-import path13 from "node:path";
+import path14 from "node:path";
 function defaultConfigRoot(env = process.env) {
   const explicit = env.MLCLAW_CONFIG_HOME?.trim();
   if (explicit) {
@@ -15024,32 +15121,32 @@ function defaultConfigRoot(env = process.env) {
   }
   const xdg = env.XDG_CONFIG_HOME?.trim();
   if (xdg) {
-    return path13.join(xdg, "mlclaw");
+    return path14.join(xdg, "mlclaw");
   }
-  return path13.join(os5.homedir(), ".config", "mlclaw");
+  return path14.join(os5.homedir(), ".config", "mlclaw");
 }
 function localConfigPaths(root) {
   return {
     root,
-    deploymentsDir: path13.join(root, "deployments"),
-    secretsDir: path13.join(root, "secrets")
+    deploymentsDir: path14.join(root, "deployments"),
+    secretsDir: path14.join(root, "secrets")
   };
 }
 function manifestPath(root, agent) {
-  return path13.join(localConfigPaths(root).deploymentsDir, `${agent}.json`);
+  return path14.join(localConfigPaths(root).deploymentsDir, `${agent}.json`);
 }
 function secretEnvPath(root, agent) {
-  return path13.join(localConfigPaths(root).secretsDir, `${agent}.env`);
+  return path14.join(localConfigPaths(root).secretsDir, `${agent}.env`);
 }
 async function writeManifest(root, manifest) {
   const file = manifestPath(root, manifest.agent);
-  await fs12.mkdir(path13.dirname(file), { recursive: true });
-  await fs12.writeFile(file, `${JSON.stringify(manifest, null, 2)}
+  await fs13.mkdir(path14.dirname(file), { recursive: true });
+  await fs13.writeFile(file, `${JSON.stringify(manifest, null, 2)}
 `, "utf8");
 }
 async function readManifest(root, agent) {
   const file = manifestPath(root, agent);
-  const parsed = JSON.parse(await fs12.readFile(file, "utf8"));
+  const parsed = JSON.parse(await fs13.readFile(file, "utf8"));
   if (parsed.version !== 1) {
     throw new Error(`unsupported deployment manifest version in ${file}`);
   }
@@ -15057,7 +15154,7 @@ async function readManifest(root, agent) {
 }
 async function manifestExists(root, agent) {
   try {
-    await fs12.access(manifestPath(root, agent));
+    await fs13.access(manifestPath(root, agent));
     return true;
   } catch {
     return false;
@@ -15069,12 +15166,12 @@ function renderSecretEnv(values) {
 }
 async function writeSecretEnv(root, agent, values) {
   const file = secretEnvPath(root, agent);
-  await fs12.mkdir(path13.dirname(file), { recursive: true, mode: 448 });
-  await fs12.writeFile(file, renderSecretEnv(values), { encoding: "utf8", mode: 384 });
-  await fs12.chmod(file, 384);
+  await fs13.mkdir(path14.dirname(file), { recursive: true, mode: 448 });
+  await fs13.writeFile(file, renderSecretEnv(values), { encoding: "utf8", mode: 384 });
+  await fs13.chmod(file, 384);
 }
 async function readSecretEnv(root, agent) {
-  return parseSecretEnv(await fs12.readFile(secretEnvPath(root, agent), "utf8"));
+  return parseSecretEnv(await fs13.readFile(secretEnvPath(root, agent), "utf8"));
 }
 function parseSecretEnv(raw) {
   const out = {};
@@ -15116,46 +15213,6 @@ function namesFor(owner, agentName) {
   };
 }
 
-// src/mlclaw/runtime-image.ts
-import fs13 from "node:fs";
-import path14 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-var RUNTIME_IMAGE_REPOSITORY = "ghcr.io/osolmaz/mlclaw-runtime";
-var DEFAULT_RUNTIME_IMAGE = `${RUNTIME_IMAGE_REPOSITORY}:${readPackageVersion()}`;
-function resolveRuntimeImage(value, env = process.env) {
-  return value?.trim() || env.MLCLAW_RUNTIME_IMAGE?.trim() || DEFAULT_RUNTIME_IMAGE;
-}
-function resolveRuntimeImageOverride(value, env = process.env) {
-  return value?.trim() || env.MLCLAW_RUNTIME_IMAGE?.trim() || void 0;
-}
-function bundledSpaceRuntimeRef(templateRev) {
-  return `bundled:${templateRev}`;
-}
-function readPackageVersion() {
-  let dir = path14.dirname(fileURLToPath3(import.meta.url));
-  while (true) {
-    const candidate = path14.join(dir, "package.json");
-    try {
-      const parsed = JSON.parse(fs13.readFileSync(candidate, "utf8"));
-      if (typeof parsed.version === "string" && parsed.version.trim()) {
-        return parsed.version.trim();
-      }
-    } catch (err) {
-      if (!isMissingFileError(err)) {
-        throw err;
-      }
-    }
-    const parent = path14.dirname(dir);
-    if (parent === dir) {
-      throw new Error("could not find package.json while resolving default runtime image");
-    }
-    dir = parent;
-  }
-}
-function isMissingFileError(err) {
-  return err instanceof Error && "code" in err && err.code === "ENOENT";
-}
-
 // src/mlclaw/telegram.ts
 var TELEGRAM_GET_ME_TIMEOUT_MS = 3e4;
 var TELEGRAM_GET_ME_ATTEMPTS = 4;
@@ -15192,7 +15249,7 @@ function delay(ms) {
 }
 
 // src/mlclaw/cli.ts
-var DEFAULT_MODEL = "huggingface/google/gemma-4-26B-A4B-it";
+var DEFAULT_MODEL = "huggingface/google/gemma-4-26B-A4B-it:deepinfra";
 var DEFAULT_HARDWARE = "cpu-basic";
 var TELEGRAM_HARDWARE = "cpu-upgrade";
 var TELEGRAM_SLEEP_TIME = -1;
@@ -15205,6 +15262,7 @@ var SPACE_HANDOFF_TIMEOUT_MS = 12e4;
 var SPACE_HANDOFF_POLL_MS = 5e3;
 var STALE_PATH_VARS = ["OPENCLAW_STATE_DIR", "OPENCLAW_WORKSPACE_DIR", "OPENCLAW_CONFIG_PATH"];
 var SNAPSHOT_MANIFEST_REMOTE_NAME = "manifest.json";
+var DEFAULT_CANONICAL_TEMPLATE_SPACE = "osolmaz/mlclaw";
 var PAID_HARDWARE_COST_NOTE = "Paid Hugging Face Space hardware costs money while allocated. The cheapest option is cpu-upgrade at $0.03/hour, about $22/month if kept always on.";
 var defaultPrompt = {
   isInteractive: () => Boolean(process4.stdin.isTTY && process4.stdout.isTTY),
@@ -15237,10 +15295,10 @@ function createProgram(runtimeOverrides = {}) {
   program2.name("mlclaw").description("Deploy OpenClaw to a Hugging Face Space and private bucket").showHelpAfterError().exitOverride((err) => {
     throw err;
   });
-  program2.command("bootstrap", { isDefault: true }).description("Create or update a Hugging Face OpenClaw deployment").option("--owner <owner>", "Hugging Face user or organization").option("--name <name>", "Agent and runtime resource base name").option("--bucket <owner/bucket>", "State bucket to create or adopt").option("--gateway <local|space>", "Where the live gateway runs").option("--telegram-token <token>", "Optional Telegram bot token").option("--telegram-token-file <path>", "File containing TELEGRAM_BOT_TOKEN=... or a raw token").option("--telegram-user-id <id>", "Allowed Telegram user ID").option("--telegram-api-root <url>", "Telegram API root override").option("--telegram-proxy <url>", "Telegram proxy URL override").option("--hardware <flavor>", "Hugging Face Space hardware flavor").option("--sleep-time <seconds>", "Space sleep timeout in seconds; -1 means never sleep", parseInteger).option("--model <model>", "OpenClaw model identifier", DEFAULT_MODEL).option("--runtime-image <image>", "ML Claw runtime image").option("--public-space", "Create the Hugging Face Space as public instead of private", false).addOption(new Option("--gateway-token <token>").hideHelp()).option("--docker-context <name>", "Docker context for local gateway mode").option("--no-pull", "Do not docker pull before starting a local gateway").option("--takeover", "Start even if a stale runtime lease is present", false).option("--yes", "Confirm paid hardware prompts for automation", false).action(async (opts) => {
+  program2.command("bootstrap", { isDefault: true }).description("Create or update a Hugging Face OpenClaw deployment").option("--owner <owner>", "Hugging Face user or organization").option("--name <name>", "Agent and runtime resource base name").option("--bucket <owner/bucket>", "State bucket to create or adopt").option("--gateway <local|space>", "Where the live gateway runs").option("--telegram-token <token>", "Optional Telegram bot token").option("--telegram-token-file <path>", "File containing TELEGRAM_BOT_TOKEN=... or a raw token").option("--telegram-user-id <id>", "Allowed Telegram user ID").option("--telegram-api-root <url>", "Telegram API root override").option("--telegram-proxy <url>", "Telegram proxy URL override").option("--hardware <flavor>", "Hugging Face Space hardware flavor").option("--sleep-time <seconds>", "Space sleep timeout in seconds; -1 means never sleep", parseInteger).option("--model <model>", "OpenClaw model identifier", DEFAULT_MODEL).option("--runtime-image <image>", "ML Claw runtime image").option("--bundled-runtime", "Generate a bundled Space runtime instead of using the prebuilt ML Claw image", false).option("--public-space", "Create the Hugging Face Space as public instead of private", false).addOption(new Option("--gateway-token <token>").hideHelp()).option("--docker-context <name>", "Docker context for local gateway mode").option("--no-pull", "Do not docker pull before starting a local gateway").option("--takeover", "Start even if a stale runtime lease is present", false).option("--yes", "Confirm paid hardware prompts for automation", false).action(async (opts) => {
     await bootstrap(opts, runtime);
   });
-  program2.command("update").description("Regenerate and upload current ML Claw Space files").argument("<owner/space>", "Hugging Face Space repo ID").option("--runtime-image <image>", "Runtime image to write into the generated Space Dockerfile").option("--force", "Update even if the Space does not look like ML Claw", false).action(async (repoId, opts) => {
+  program2.command("update").description("Regenerate and upload current ML Claw Space files").argument("<owner/space>", "Hugging Face Space repo ID").option("--runtime-image <image>", "Runtime image to write into the generated Space Dockerfile").option("--bundled-runtime", "Generate a bundled Space runtime instead of using the prebuilt ML Claw image", false).option("--force", "Update even if the Space does not look like ML Claw", false).action(async (repoId, opts) => {
     const token = await runtime.readToken(runtime.env);
     const hub = runtime.hubFactory(token);
     await update(repoId, opts, hub, token, runtime);
@@ -15272,7 +15330,7 @@ function createProgram(runtimeOverrides = {}) {
   gateway.command("logs").argument("<agent>", "Agent name").option("--tail <lines>", "Number of log lines", parseInteger, 200).action(async (agent, opts) => {
     await gatewayLogs(agent, opts, runtime);
   });
-  gateway.command("migrate").argument("<agent>", "Agent name").requiredOption("--to <local|space>", "Target gateway location").option("--hardware <flavor>", "Hugging Face Space hardware flavor").option("--sleep-time <seconds>", "Space sleep timeout in seconds; -1 means never sleep", parseInteger).option("--runtime-image <image>", "ML Claw runtime image").option("--public-space", "Create the Hugging Face Space as public instead of private", false).option("--docker-context <name>", "Docker context for local gateway startup when migrating to local").option("--no-pull", "Do not docker pull before starting a local gateway").option("--takeover", "Start even if another live runtime lease is present", false).option("--yes", "Confirm paid hardware prompts for automation", false).action(async (agent, opts) => {
+  gateway.command("migrate").argument("<agent>", "Agent name").requiredOption("--to <local|space>", "Target gateway location").option("--hardware <flavor>", "Hugging Face Space hardware flavor").option("--sleep-time <seconds>", "Space sleep timeout in seconds; -1 means never sleep", parseInteger).option("--runtime-image <image>", "ML Claw runtime image").option("--bundled-runtime", "Generate a bundled Space runtime instead of using the prebuilt ML Claw image", false).option("--public-space", "Create the Hugging Face Space as public instead of private", false).option("--docker-context <name>", "Docker context for local gateway startup when migrating to local").option("--no-pull", "Do not docker pull before starting a local gateway").option("--takeover", "Start even if another live runtime lease is present", false).option("--yes", "Confirm paid hardware prompts for automation", false).action(async (agent, opts) => {
     await gatewayMigrate(agent, opts, runtime);
   });
   gateway.command("rebind").argument("<agent>", "Agent name").requiredOption("--docker-context <name>", "Target Docker context").option("--no-pull", "Do not docker pull before starting the rebound local gateway").option("--takeover", "Rebind even if the old Docker context is unavailable", false).action(async (agent, opts) => {
@@ -15307,75 +15365,43 @@ async function bootstrap(opts, runtime) {
   const owner = opts.owner ?? me2.name;
   const telegramToken = await readOptionalTelegramToken(opts, runtime);
   const bot = telegramToken ? await runtime.getTelegramBot(telegramToken, opts.telegramApiRoot) : void 0;
-  const agentName = slugifyAgentName(opts.name ?? bot?.username ?? await promptAgentName(runtime));
+  let agentName = slugifyAgentName(opts.name ?? bot?.username ?? await promptAgentName(runtime));
   const telegramUserId = telegramToken ? opts.telegramUserId ?? runtime.env.TELEGRAM_ALLOWED_USERS ?? await promptRequired("Telegram allowed user ID", runtime) : void 0;
-  const names = namesFor(owner, agentName);
   const model = opts.model ?? DEFAULT_MODEL;
   const runtimeImage = resolveRuntimeImage(opts.runtimeImage, runtime.env);
-  const templateRuntimeImage = resolveRuntimeImageOverride(opts.runtimeImage, runtime.env);
-  const sessionSecret = randomBytes(48).toString("base64url");
-  const now = runtime.now().toISOString();
-  const existingManifest = await readManifest(runtime.configRoot, agentName).catch(() => null);
-  const existingSecrets = await readSecretEnv(runtime.configRoot, agentName).catch(() => ({}));
-  const gatewayLocation = requestedGatewayLocation ?? existingManifest?.gatewayLocation ?? DEFAULT_GATEWAY_LOCATION;
-  if (opts.dockerContext && gatewayLocation !== "local") {
-    throw new Error("--docker-context only applies to local gateway mode");
+  const templateRuntimeImage = resolveSpaceRuntimeImage(opts, runtime.env);
+  let plan;
+  for (; ; ) {
+    plan = await resolveBootstrapPlan({
+      opts,
+      owner,
+      agentName,
+      hfToken,
+      model,
+      runtimeImage,
+      hub,
+      runtime,
+      ...requestedGatewayLocation ? { requestedGatewayLocation } : {},
+      ...telegramToken ? { telegramToken } : {},
+      ...telegramUserId ? { telegramUserId } : {}
+    });
+    const alternative = await promptAlternativeBootstrapName({
+      plan,
+      explicitBucket: opts.bucket,
+      yes: Boolean(opts.yes),
+      runtime
+    });
+    if (!alternative) {
+      break;
+    }
+    agentName = alternative;
   }
-  const bucketPrefix = bootstrapBucketPrefix(existingManifest, existingSecrets, runtime);
-  const localRuntimeId = existingManifest?.localRuntimeId ?? newLocalRuntimeId(agentName);
-  const localGateway = gatewayLocation === "local" ? await resolveLocalGatewayBinding({
-    manifest: existingManifest,
-    requestedContext: opts.dockerContext,
-    runtime,
-    persist: false
-  }) : existingManifest?.localGateway;
-  const bucket = await resolveBootstrapBucket({
-    explicitBucket: opts.bucket,
-    defaultBucket: names.bucket,
-    existingManifest,
-    bucketPrefix,
-    hub,
-    yes: Boolean(opts.yes),
-    runtime
-  });
-  const manifest = {
-    version: 1,
-    agent: agentName,
-    owner,
-    bucket,
-    space: names.space,
-    localRuntimeId,
-    gatewayLocation,
-    model,
-    runtimeImage,
-    ...localGateway ? { localGateway } : {},
-    createdAt: existingManifest?.createdAt ?? now,
-    updatedAt: now
-  };
-  const secrets = deploymentSecrets({
-    hfToken,
-    ...telegramToken ? { telegramToken } : {},
-    ...telegramUserId ? { telegramUserId } : {},
-    sessionSecret,
-    bucket,
-    model,
-    agentName,
-    runtimeImage,
-    gatewayLocation,
-    runtimeId: gatewayLocation === "local" ? manifest.localRuntimeId : spaceRuntimeId(agentName),
-    ...bucketPrefix ? { bucketPrefix } : {},
-    ...opts.telegramProxy ? { telegramProxy: opts.telegramProxy } : {},
-    ...opts.telegramApiRoot ? { telegramApiRoot: opts.telegramApiRoot } : {}
-  });
+  const { names, gatewayLocation, bucketPlan, bucket, spacePlan, manifest, secrets } = plan;
   let deployedSpaceRuntime;
   if (gatewayLocation === "space") {
-    await assertNoLiveForeignLease({
-      hub,
-      bucket,
-      bucketPrefix,
-      runtimeId: spaceRuntimeId(agentName),
-      takeover: Boolean(opts.takeover)
-    });
+    if (!spacePlan) {
+      throw new Error("internal error: Space plan was not resolved");
+    }
     const paidHardware = await resolveHardware({
       requestedHardware: opts.hardware ?? (telegramToken ? TELEGRAM_HARDWARE : DEFAULT_HARDWARE),
       ...typeof opts.sleepTime === "number" ? { requestedSleepTime: opts.sleepTime } : telegramToken ? { requestedSleepTime: TELEGRAM_SLEEP_TIME } : {},
@@ -15383,6 +15409,24 @@ async function bootstrap(opts, runtime) {
       yes: Boolean(opts.yes),
       runtime
     });
+    await confirmBootstrapPlan({
+      manifest,
+      bucketPlan,
+      spacePlan,
+      hasExistingManifest: plan.hasExistingManifest,
+      hardware: paidHardware.hardware,
+      ...typeof paidHardware.sleepTime === "number" ? { sleepTime: paidHardware.sleepTime } : {},
+      yes: Boolean(opts.yes),
+      runtime
+    });
+    await createOrAdoptBucket({ hub, bucketPlan, runtime });
+    await assertNoLiveForeignLease({
+      hub,
+      bucket,
+      bucketPrefix: plan.bucketPrefix,
+      runtimeId: spaceRuntimeId(agentName),
+      takeover: Boolean(opts.takeover)
+    });
     const deployed = await deploySpaceGateway({
       hub,
       runtime,
@@ -15391,6 +15435,7 @@ async function bootstrap(opts, runtime) {
       secrets,
       allowedUsers: me2.name,
       hardware: paidHardware.hardware,
+      spaceExists: spacePlan.exists,
       publicSpace: Boolean(opts.publicSpace),
       ...typeof paidHardware.sleepTime === "number" ? { sleepTime: paidHardware.sleepTime } : {},
       ...templateRuntimeImage ? { templateRuntimeImage } : {}
@@ -15398,10 +15443,19 @@ async function bootstrap(opts, runtime) {
     deployedSpaceRuntime = deployed.runtimeImage;
     await writeLocalDeployment(runtime.configRoot, manifest, secrets);
   } else {
+    await confirmBootstrapPlan({
+      manifest,
+      bucketPlan,
+      hasExistingManifest: plan.hasExistingManifest,
+      hardware: "local Docker",
+      yes: Boolean(opts.yes),
+      runtime
+    });
+    await createOrAdoptBucket({ hub, bucketPlan, runtime });
     await assertNoLiveForeignLease({
       hub,
       bucket,
-      bucketPrefix,
+      bucketPrefix: plan.bucketPrefix,
       runtimeId: manifest.localRuntimeId,
       takeover: Boolean(opts.takeover)
     });
@@ -15417,6 +15471,7 @@ async function bootstrap(opts, runtime) {
   runtime.stdout.log(`Bucket: https://huggingface.co/buckets/${bucket}`);
   if (gatewayLocation === "space") {
     runtime.stdout.log(`Space:  https://huggingface.co/spaces/${names.space}`);
+    runtime.stdout.log(`Agent URL: ${spacePublicUrl(names.space)}`);
   } else {
     runtime.stdout.log(`Local:  ${containerNameFor(agentName)}`);
   }
@@ -15429,29 +15484,163 @@ async function bootstrap(opts, runtime) {
   if (deployedSpaceRuntime) {
     runtime.stdout.log(`Space runtime: ${deployedSpaceRuntime}`);
   }
-  runtime.prompt.outro(gatewayLocation === "space" ? "Restart requested. Build logs may take a few minutes to appear." : "Local gateway start requested.");
+  runtime.prompt.outro(gatewayLocation === "space" ? `Restart requested. Your agent will soon be available at ${spacePublicUrl(names.space)}.` : "Local gateway start requested.");
+}
+function spacePublicUrl(repoId) {
+  return `https://${repoId.replace("/", "-")}.hf.space`;
+}
+async function resolveBootstrapPlan(params) {
+  const { opts, owner, agentName, requestedGatewayLocation, hfToken, telegramToken, telegramUserId, model, runtimeImage, hub, runtime } = params;
+  const names = namesFor(owner, agentName);
+  const sessionSecret = randomBytes(48).toString("base64url");
+  const now = runtime.now().toISOString();
+  const existingManifest = await readManifest(runtime.configRoot, agentName).catch(() => null);
+  const existingSecrets = await readSecretEnv(runtime.configRoot, agentName).catch(() => ({}));
+  const gatewayLocation = requestedGatewayLocation ?? existingManifest?.gatewayLocation ?? DEFAULT_GATEWAY_LOCATION;
+  if (opts.dockerContext && gatewayLocation !== "local") {
+    throw new Error("--docker-context only applies to local gateway mode");
+  }
+  const bucketPrefix = bootstrapBucketPrefix(existingManifest, existingSecrets, runtime);
+  const localRuntimeId = existingManifest?.localRuntimeId ?? newLocalRuntimeId(agentName);
+  const localGateway = gatewayLocation === "local" ? await resolveLocalGatewayBinding({
+    manifest: existingManifest,
+    requestedContext: opts.dockerContext,
+    runtime,
+    persist: false
+  }) : existingManifest?.localGateway;
+  const bucketPlan = await resolveBootstrapBucket({
+    explicitBucket: opts.bucket,
+    defaultBucket: names.bucket,
+    existingManifest,
+    bucketPrefix,
+    hub
+  });
+  const bucket = bucketPlan.bucket;
+  const spacePlan = gatewayLocation === "space" ? {
+    space: names.space,
+    exists: await hub.spaceExists(names.space),
+    visibility: opts.publicSpace ? "public" : "private"
+  } : void 0;
+  const manifest = {
+    version: 1,
+    agent: agentName,
+    owner,
+    bucket,
+    space: names.space,
+    localRuntimeId,
+    gatewayLocation,
+    model,
+    runtimeImage,
+    ...localGateway ? { localGateway } : {},
+    createdAt: existingManifest?.createdAt ?? now,
+    updatedAt: now
+  };
+  const secrets = deploymentSecrets({
+    hfToken,
+    ...telegramToken ? { telegramToken } : {},
+    ...telegramUserId ? { telegramUserId } : {},
+    sessionSecret,
+    bucket,
+    model,
+    agentName,
+    runtimeImage,
+    gatewayLocation,
+    runtimeId: gatewayLocation === "local" ? manifest.localRuntimeId : spaceRuntimeId(agentName),
+    ...bucketPrefix ? { bucketPrefix } : {},
+    ...opts.telegramProxy ? { telegramProxy: opts.telegramProxy } : {},
+    ...opts.telegramApiRoot ? { telegramApiRoot: opts.telegramApiRoot } : {}
+  });
+  return {
+    agentName,
+    names,
+    hasExistingManifest: Boolean(existingManifest),
+    gatewayLocation,
+    ...bucketPrefix ? { bucketPrefix } : {},
+    bucketPlan,
+    bucket,
+    ...spacePlan ? { spacePlan } : {},
+    manifest,
+    secrets
+  };
 }
 async function resolveBootstrapBucket(params) {
   const explicitBucket = params.explicitBucket ? parseBucketId(params.explicitBucket) : void 0;
   const bucket = explicitBucket ?? params.existingManifest?.bucket ?? params.defaultBucket;
-  params.runtime.stdout.log(`Creating or adopting private bucket ${bucket}`);
-  await params.hub.createBucket(bucket, true);
-  const inspection = await inspectStateBucket(params.hub, bucket, params.bucketPrefix);
-  const existingBucket = params.existingManifest?.bucket;
-  if (explicitBucket && existingBucket && existingBucket !== explicitBucket) {
-    await confirmBucketChange({
-      message: `Change ${params.existingManifest?.agent ?? "deployment"} state bucket from ${existingBucket} to ${explicitBucket}?`,
-      yes: params.yes,
-      runtime: params.runtime
-    });
-  } else if (explicitBucket && !existingBucket && inspection.objectCount > 0) {
-    await confirmBucketChange({
-      message: `Adopt existing state bucket ${explicitBucket} with ${inspection.objectCount} object(s)?`,
-      yes: params.yes,
-      runtime: params.runtime
-    });
+  const exists = await params.hub.bucketExists(bucket);
+  const inspection = exists ? await inspectStateBucket(params.hub, bucket, params.bucketPrefix) : { objectCount: 0 };
+  return {
+    bucket,
+    exists,
+    objectCount: inspection.objectCount
+  };
+}
+async function promptAlternativeBootstrapName(params) {
+  const existingDefaultBucket = !params.explicitBucket && params.plan.bucketPlan.exists;
+  const existingSpace = params.plan.spacePlan?.exists === true;
+  if (!existingDefaultBucket && !existingSpace || params.yes || !params.runtime.prompt.isInteractive()) {
+    return void 0;
+  }
+  const current = params.plan.agentName;
+  const suggestion = `${current}-2`;
+  params.runtime.prompt.note(
+    `The name ${current} maps to existing ML Claw resources. Enter another name for a fresh deployment, or leave this blank to update the existing one.`,
+    "Existing resources"
+  );
+  const value = await params.runtime.prompt.text({
+    message: "Alternative agent name",
+    placeholder: suggestion
+  });
+  if (q(value)) {
+    params.runtime.prompt.cancel("Cancelled");
+    throw new Error("cancelled");
+  }
+  const raw = value.trim();
+  if (!raw) {
+    return void 0;
+  }
+  const alternative = slugifyAgentName(raw);
+  return alternative === current ? void 0 : alternative;
+}
+async function confirmBootstrapPlan(params) {
+  const lines = [
+    `Agent: ${params.manifest.agent}`,
+    `Gateway: ${params.manifest.gatewayLocation}`,
+    `Bucket: ${params.bucketPlan.bucket} (${params.bucketPlan.exists ? `exists; keeping ${params.bucketPlan.objectCount} object(s)` : "will be created as private"})`
+  ];
+  if (params.spacePlan) {
+    lines.push(`Space: ${params.spacePlan.space} (${params.spacePlan.exists ? "exists; files, variables, secrets, and runtime will be updated" : `will be created as ${params.spacePlan.visibility}`})`);
+    lines.push(`Hardware: ${params.hardware}`);
+    if (typeof params.sleepTime === "number") {
+      lines.push(`Sleep time: ${params.sleepTime}`);
+    }
+  } else {
+    lines.push(`Local runtime: ${containerNameFor(params.manifest.agent)} (${params.hardware})`);
+  }
+  if (params.bucketPlan.exists || params.spacePlan?.exists) {
+    lines.push(`Fresh deployment: use a different name, for example --name ${params.manifest.agent}-2`);
+  }
+  lines.push(`Model: ${params.manifest.model}`);
+  lines.push(`Runtime image: ${params.manifest.runtimeImage}`);
+  params.runtime.prompt.note(lines.join("\n"), "Bootstrap plan");
+  if (params.yes) {
+    return;
+  }
+  if (!params.runtime.prompt.isInteractive()) {
+    throw new Error("bootstrap confirmation required. Pass --yes to continue non-interactively.");
+  }
+  const ok = await promptConfirm("Continue with this bootstrap plan?", true, params.runtime);
+  if (!ok) {
+    throw new Error("bootstrap was not confirmed");
   }
-  return bucket;
+}
+async function createOrAdoptBucket(params) {
+  if (params.bucketPlan.exists) {
+    params.runtime.stdout.log(`Using existing private bucket ${params.bucketPlan.bucket}`);
+    return;
+  } else {
+    params.runtime.stdout.log(`Creating private bucket ${params.bucketPlan.bucket}`);
+  }
+  await params.hub.createBucket(params.bucketPlan.bucket, true);
 }
 async function stateAdopt(agent, opts, runtime) {
   const bucket = parseBucketId(requiredOption(opts.bucket, "--bucket"));
@@ -15622,14 +15811,14 @@ async function writeLocalDeployment(configRoot2, manifest, secrets) {
 }
 async function deploySpaceGateway(params) {
   const { hub, runtime, hfToken, manifest, secrets } = params;
-  runtime.stdout.log(`Creating ${params.publicSpace ? "public" : "private"} Space ${manifest.space}`);
+  runtime.stdout.log(params.spaceExists ? `Updating existing Space ${manifest.space}` : `Creating ${params.publicSpace ? "public" : "private"} Space ${manifest.space}`);
   await hub.createDockerSpace(manifest.space, {
     private: !params.publicSpace,
     hardware: params.hardware,
     ...typeof params.sleepTime === "number" ? { sleepTimeSeconds: params.sleepTime } : {}
   });
   await hub.requestSpaceHardware(manifest.space, params.hardware, params.sleepTime);
-  runtime.stdout.log(params.templateRuntimeImage ? "Generating Space files from explicit runtime image" : "Generating bundled Space runtime files");
+  runtime.stdout.log(params.templateRuntimeImage ? "Generating Space files from prebuilt runtime image" : "Generating bundled Space runtime files");
   const { templateRev } = await runtime.pushTemplateToSpace({
     targetRepo: manifest.space,
     token: hfToken,
@@ -15830,7 +16019,7 @@ async function gatewayMigrate(agent, opts, runtime) {
     });
     await handoffAndStopLocalGateway({ manifest: current, hub, runtime, bucketPrefix });
     const me2 = await hub.whoami();
-    const templateRuntimeImage = resolveRuntimeImageOverride(opts.runtimeImage, runtime.env);
+    const templateRuntimeImage = resolveSpaceRuntimeImage(opts, runtime.env);
     await deploySpaceGateway({
       hub,
       runtime,
@@ -16179,10 +16368,11 @@ function shouldPull(opts) {
 }
 async function update(repoId, opts, hub, hfToken, runtime) {
   const variables = await hub.getSpaceVariables(repoId);
-  if (!variables.has("MLCLAW_TEMPLATE_REV") && !variables.has("OPENCLAW_HF_TEMPLATE_REV") && !opts.force) {
+  const canonicalTemplate = isCanonicalTemplateSpace(repoId, runtime.env);
+  if (!canonicalTemplate && !variables.has("MLCLAW_TEMPLATE_REV") && !variables.has("OPENCLAW_HF_TEMPLATE_REV") && !opts.force) {
     throw new Error(`${repoId} does not look like a ML Claw deployment; pass --force to update anyway`);
   }
-  const runtimeImage = resolveRuntimeImageOverride(opts.runtimeImage, runtime.env);
+  const runtimeImage = resolveSpaceRuntimeImage(opts, runtime.env);
   const agentName = variables.get("OPENCLAW_AGENT_NAME")?.value?.trim() || repoId.split("/")[1] || "openclaw";
   runtime.stdout.log(`Generating current Space files into ${repoId}`);
   const { templateRev } = await runtime.pushTemplateToSpace({
@@ -16192,6 +16382,12 @@ async function update(repoId, opts, hub, hfToken, runtime) {
   });
   await hub.addSpaceVariable(repoId, "MLCLAW_TEMPLATE_REV", templateRev);
   await hub.addSpaceVariable(repoId, "MLCLAW_RUNTIME_IMAGE", runtimeImage ?? bundledSpaceRuntimeRef(templateRev));
+  if (canonicalTemplate) {
+    await hub.addSpaceVariable(repoId, "MLCLAW_CANONICAL_SPACE_ID", canonicalTemplateSpaceId(runtime.env));
+    await doctor(repoId, { fix: true }, hub, runtime);
+    await hub.restartSpace(repoId, true);
+    return;
+  }
   await hub.addSpaceVariable(repoId, "MLCLAW_GATEWAY_LOCATION", "space");
   await hub.addSpaceVariable(repoId, "MLCLAW_RUNTIME_ID", spaceRuntimeId(agentName));
   await hub.addSpaceVariable(repoId, "MLCLAW_OPENCLAW_PORT", String(DEFAULT_SPACE_OPENCLAW_PORT));
@@ -16209,6 +16405,42 @@ async function doctor(repoId, opts, hub, runtime) {
   const secrets = await hub.getSpaceSecrets(repoId);
   const issues = [];
   const fixed = [];
+  const canonicalTemplate = isCanonicalTemplateSpace(repoId, runtime.env);
+  if (canonicalTemplate) {
+    const expectedCanonicalSpace = canonicalTemplateSpaceId(runtime.env);
+    if ((variables.get("MLCLAW_CANONICAL_SPACE_ID")?.value ?? "") !== expectedCanonicalSpace) {
+      if (fix) {
+        await hub.addSpaceVariable(repoId, "MLCLAW_CANONICAL_SPACE_ID", expectedCanonicalSpace);
+        fixed.push("set MLCLAW_CANONICAL_SPACE_ID");
+      } else {
+        issues.push(`MLCLAW_CANONICAL_SPACE_ID is not ${expectedCanonicalSpace}`);
+      }
+    }
+    if (!variables.has("MLCLAW_TEMPLATE_REV") && !variables.has("OPENCLAW_HF_TEMPLATE_REV")) {
+      issues.push("MLCLAW_TEMPLATE_REV is missing; run `mlclaw update` to refresh the template Space");
+    }
+    addRuntimeImageFindings(variables.get("MLCLAW_RUNTIME_IMAGE")?.value, issues);
+    const runtimeInfo2 = await hub.getSpaceRuntime(repoId);
+    runtime.stdout.log(`Space: ${repoId}`);
+    runtime.stdout.log("Mode: template");
+    runtime.stdout.log(`Stage: ${runtimeInfo2.stage ?? "unknown"}`);
+    runtime.stdout.log(`Hardware: ${formatRuntimeValue(runtimeInfo2.requested_hardware ?? runtimeInfo2.hardware)}`);
+    if (typeof runtimeInfo2.sleep_time === "number") {
+      runtime.stdout.log(`Sleep time: ${runtimeInfo2.sleep_time}`);
+    }
+    if (fixed.length > 0) {
+      runtime.stdout.log(`Fixed: ${fixed.join(", ")}`);
+    }
+    if (issues.length === 0) {
+      runtime.stdout.log("Doctor: clean");
+    } else {
+      runtime.stdout.log("Doctor findings:");
+      for (const issue of issues) {
+        runtime.stdout.log(`- ${issue}`);
+      }
+    }
+    return;
+  }
   const bucket = variables.get("OPENCLAW_HF_STATE_BUCKET")?.value ?? opts.bucket;
   let signedInUser;
   const currentUsername = async () => {
@@ -16248,9 +16480,7 @@ async function doctor(repoId, opts, hub, runtime) {
   if ((variables.get("MLCLAW_GATEWAY_LOCATION")?.value ?? "") !== "space") {
     issues.push("MLCLAW_GATEWAY_LOCATION is not set to space");
   }
-  if (!variables.has("MLCLAW_RUNTIME_IMAGE")) {
-    issues.push("MLCLAW_RUNTIME_IMAGE is missing");
-  }
+  addRuntimeImageFindings(variables.get("MLCLAW_RUNTIME_IMAGE")?.value, issues);
   if ((variables.get("MLCLAW_OPENCLAW_PORT")?.value ?? "") !== String(DEFAULT_SPACE_OPENCLAW_PORT) && fix) {
     await hub.addSpaceVariable(repoId, "MLCLAW_OPENCLAW_PORT", String(DEFAULT_SPACE_OPENCLAW_PORT));
     fixed.push("set MLCLAW_OPENCLAW_PORT");
@@ -16315,6 +16545,26 @@ async function doctor(repoId, opts, hub, runtime) {
     }
   }
 }
+function canonicalTemplateSpaceId(env) {
+  return nonEmpty(env.MLCLAW_CANONICAL_SPACE_ID) ?? DEFAULT_CANONICAL_TEMPLATE_SPACE;
+}
+function isCanonicalTemplateSpace(repoId, env) {
+  return repoId === canonicalTemplateSpaceId(env);
+}
+function addRuntimeImageFindings(value, issues) {
+  const runtimeImage = value?.trim();
+  if (!runtimeImage) {
+    issues.push("MLCLAW_RUNTIME_IMAGE is missing; run `mlclaw update` to refresh the Space runtime");
+    return;
+  }
+  if (runtimeImage.startsWith("ghcr.io/osolmaz/mlclaw-runtime:")) {
+    issues.push(`MLCLAW_RUNTIME_IMAGE points at the legacy mlclaw-runtime package; run \`mlclaw update\` to use ${DEFAULT_RUNTIME_IMAGE}`);
+    return;
+  }
+  if (runtimeImage.startsWith("bundled:")) {
+    issues.push(`MLCLAW_RUNTIME_IMAGE uses a bundled runtime; run \`mlclaw update\` to use ${DEFAULT_RUNTIME_IMAGE}`);
+  }
+}
 async function settings(repoId, opts, hub, runtime) {
   if (opts.gateway) {
     throw new Error("gateway location changes must use `mlclaw gateway migrate` to preserve state");
@@ -16391,7 +16641,7 @@ async function promptAgentName(runtime) {
   }
   const value = await runtime.prompt.text({
     message: "Agent name",
-    placeholder: "bob",
+    placeholder: "mlclaw",
     initialValue: "mlclaw"
   });
   return readPromptValue(value, "Agent name");