@downdraft/cli 0.1.0 → 0.1.2-alpha.5

package/scripts/package-mobile.mjs

@@ -146,7 +146,7 @@ const GLOB_RE = new RegExp(IMPORT_META.source + String.raw`\.glob\(\s*(["'\`])([
 const GLOB_EAGER_RE = new RegExp(
   IMPORT_META.source + String.raw`\.glob\(\s*(["'\`])([^"'\`]+)\1\s*,\s*(\{[^)]*\beager\s*:\s*true[^)]*\})\s*\)`, "g");
 const STAGE_GLOB_RE = new RegExp(
-  `(?:${IMPORT_META.source}\\.glob|_glob)\\(\\s*(["'\`])([^"'\`]+)\\1|createGlob\\([^)]*\\)\\(\\s*(["'\`])([^"'\`]+)\\3`, "g");
+  `(?:${IMPORT_META.source}\\.glob|_glob|globAssets)\\(\\s*(["'\`])([^"'\`]+)\\1|createGlob\\([^)]*\\)\\(\\s*(["'\`])([^"'\`]+)\\3`, "g");
 const STAGE_READ_RE = new RegExp(
   String.raw`(?:resolve|join)\(\s*(?:__dirname|${IMPORT_META.source}\.(?:dir|dirname|url))\s*,\s*(["'\`])([^"'\`]+)\1`, "g");
 const META_DIR_RE = new RegExp(IMPORT_META.source + String.raw`\.(?:dir|dirname)\b`, "g");
@@ -414,7 +414,11 @@ const makePlugin = (collectWorkers) => ({
           `const __ddModUrl = __ddP2F(__ddModDir + "/" + ${JSON.stringify(modBase)}).href;\n` +
           (needsGlob
             ? `import { createGlob as __ddCreateGlob } from "@downdraft/engine/platform/glob-polyfill";\n` +
-              `const __ddGlob = __ddCreateGlob(__ddModDir);\n`
+              // Lazy — eager construction runs at module-init time and can
+              // hit a TDZ on consts declared later in the same module
+              // (glob-polyfill.ts itself matches REQUIRE_GLOB_RE via a
+              // comment).
+              `const __ddGlob = (p, o) => __ddCreateGlob(__ddModDir)(p, o);\n`
             : "") +
           metaOut;
       }
@@ -577,6 +581,31 @@ if (envPairs.length) {
   writeFileSync(join(bundleDir, "dd-env.txt"), envPairs.join("\n") + "\n");
 }
 
+// Game-native addons — convention: <game>/native/dist/android-<arch>/*.node
+// are napi modules the game built itself. .node files aren't jniLibs (the OS
+// only installs lib*.so), so they ride inside the extracted bundle instead:
+// the shell unpacks them to a real path under DOWNDRAFT_BUNDLE_DIR/native/
+// and require()/process.dlopen resolves napi_* against the RTLD_GLOBAL
+// libnode (the -Wl,-z,global link flag exists for exactly this).
+// Staged BEFORE manifest.txt so the extractor's file list covers them.
+// (.so siblings are handled per-ABI in the native-libs section below.)
+{
+  let staged = 0;
+  for (const abi of abis) {
+    const platDir = join(gameDir, "native", "dist",
+      `android-${abi.startsWith("arm64") ? "arm64" : "x64"}`);
+    if (!existsSync(platDir)) continue;
+    const dest = join(bundleDir, "native", `android-${abi.startsWith("arm64") ? "arm64" : "x64"}`);
+    for (const f of readdirSync(platDir)) {
+      if (!f.endsWith(".node")) continue;
+      mkdirSync(dest, { recursive: true });
+      copyFileSync(join(platDir, f), join(dest, f));
+      staged++;
+    }
+  }
+  if (staged) console.log(`[package-mobile] staged ${staged} game-native addon(s) into bundle/native/`);
+}
+
 // manifest.txt — the shell's extractor follows this verbatim (AAssetDir
 // can't enumerate subdirectories). aapt2 silently drops asset paths with
 // dot-prefixed segments (.bun, .gitignore), so each line is
@@ -645,11 +674,11 @@ for (const abi of abis) {
       ? join(monorepoRoot, `packages/node-mobile/build/dist/android-${nodeFlavor}`, abi, "libnode.so")
       : null,
     join(monorepoRoot, "packages/node-mobile/build/dist/android", abi, "libnode.so"),
-    join(monorepoRoot, `packages/node-mobile-android-${abi.startsWith("arm64") ? "arm64" : "x64"}/lib/libnode.so`),
+    join(monorepoRoot, `packages/native-mobile-android-${abi.startsWith("arm64") ? "arm64" : "x64"}/lib/libnode.so`),
   ].filter(Boolean);
   let libnode = libnodeCandidates.find(existsSync);
   if (!libnode) {
-    try { libnode = join(dirname(gameRequire.resolve(`@downdraft/node-mobile-android-${abi.startsWith("arm64") ? "arm64" : "x64"}/package.json`)), "lib/libnode.so"); } catch { /* absent */ }
+    try { libnode = join(dirname(gameRequire.resolve(`@downdraft/native-mobile-android-${abi.startsWith("arm64") ? "arm64" : "x64"}/package.json`)), "lib/libnode.so"); } catch { /* absent */ }
   }
   if (!libnode || !existsSync(libnode)) {
     throw new Error(`libnode.so for ${abi} not found — build via packages/node-mobile/scripts/build-android.mjs`);
@@ -703,6 +732,20 @@ for (const abi of abis) {
     if (existsSync(src)) copyFileSync(src, join(libDir, file));
   }
 
+  // Game-native cdylibs — <game>/native/dist/android-<arch>/lib*.so ride in
+  // jniLibs like the engine crates: the OS installs them to the app's native
+  // lib dir, where koffi/Deno.dlopen resolves them by bare soname (same
+  // mechanism lib-paths.ts's android branch relies on).
+  const gamePlatDir = join(gameDir, "native", "dist", nodePlat);
+  if (existsSync(gamePlatDir)) {
+    for (const f of readdirSync(gamePlatDir)) {
+      if (f.startsWith("lib") && f.endsWith(".so")) {
+        copyFileSync(join(gamePlatDir, f), join(libDir, f));
+        console.log(`[package-mobile] staged game-native ${f} → lib/${abi}/`);
+      }
+    }
+  }
+
   // Strip staged .so's — debug info and the symtab never map at runtime, so
   // this is pure APK/install size (libnode alone sheds ~25MB). Crash
   // symbolication still works: .dynsym and unwind info are preserved.

package/scripts/package-native.mjs

@@ -46,6 +46,7 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { resolvePlatLibDir } from "./native-lib-fetch.mjs";
 
 // CRATES is shared with the repo's scripts/native-crates.mjs when this file
 // runs inside the monorepo. In a published @downdraft/cli install the repo
@@ -110,7 +111,7 @@ const GLOB_RE = new RegExp(IMPORT_META.source + String.raw`\.glob\(\s*(["'\`])([
 // Staging scan covers all glob call forms: import.meta.glob("pat"), the
 // common _glob("pat") alias, and createGlob(modDir)("pat").
 const STAGE_GLOB_RE = new RegExp(
-  `(?:${IMPORT_META.source}\\.glob|_glob)\\(\\s*(["'\`])([^"'\`]+)\\1|createGlob\\([^)]*\\)\\(\\s*(["'\`])([^"'\`]+)\\3`, "g");
+  `(?:${IMPORT_META.source}\\.glob|_glob|globAssets)\\(\\s*(["'\`])([^"'\`]+)\\1|createGlob\\([^)]*\\)\\(\\s*(["'\`])([^"'\`]+)\\3`, "g");
 // Module-relative file reads: resolve(__dirname, "./zstd.wasm"),
 // join(import.meta.dir, "data.bin") — stage the referenced file.
 const STAGE_READ_RE = new RegExp(
@@ -371,7 +372,11 @@ const makePlugin = (collectWorkers) => ({
           `const __ddModUrl = __ddP2F(__ddModDir + "/" + ${JSON.stringify(modBase)}).href;\n` +
           (needsGlob
             ? `import { createGlob as __ddCreateGlob } from "@downdraft/engine/platform/glob-polyfill";\n` +
-              `const __ddGlob = __ddCreateGlob(__ddModDir);\n`
+              // Lazy — eager construction runs at module-init time and can
+              // hit a TDZ on consts declared later in the same module
+              // (glob-polyfill.ts itself matches REQUIRE_GLOB_RE via a
+              // comment).
+              `const __ddGlob = (p, o) => __ddCreateGlob(__ddModDir)(p, o);\n`
             : "") +
           metaOut;
       }
@@ -440,8 +445,8 @@ result.outputs.forEach((out) => {
 // Metadata precedence: --product-name/--product-version/--icon flags, then
 // the game's package.json (productName / build.productName, version,
 // build.icon or icon.ico|icon.png in the game dir), then the game name.
+const gameDir = dirname(dirname(resolve(entry))); // src/native-entry.ts → game root
 if (target.exe) {
-  const gameDir = dirname(dirname(resolve(entry))); // src/native-entry.ts → game root
   let pkg = {};
   try { pkg = JSON.parse(readFileSync(join(gameDir, "package.json"), "utf-8")); } catch { /* standalone entry */ }
   const titleize = (s) => String(s).replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
@@ -556,20 +561,26 @@ function pkgRoot(name) {
 // wgpu — no external deps) stages under native/<platform>-<arch>/. Probe
 // order: monorepo dev staging, the installed platform-native package, the
 // per-target @downdraft/native-<plat>-<arch> package.
+const platPkg = pkgRoot("@downdraft/platform-native");
 const platLibCandidates = [...new Set([
   join(monorepoRoot, "packages/platform-native/native", platKey),
-  pkgRoot("@downdraft/platform-native") && join(pkgRoot("@downdraft/platform-native"), "native", platKey),
+  platPkg && join(platPkg, "native", platKey),
+  platPkg && join(platPkg, platKey),
   pkgRoot(`@downdraft/native-${platKey}`) && join(pkgRoot(`@downdraft/native-${platKey}`), "lib"),
 ].filter(Boolean))];
-const platStageDir = platLibCandidates.find((d) => existsSync(d));
-if (platStageDir) {
-  for (const f of readdirSync(platStageDir)) {
-    if (f.endsWith(libExt)) copyFileSync(join(platStageDir, f), join(nativeDir, f));
-  }
-} else {
+// Foreign-platform optional deps aren't installed on this host — fetch the
+// @downdraft/native-<plat>-<arch> tarball from npm into a cache instead.
+const platPkgVersion = platPkg &&
+  JSON.parse(readFileSync(join(platPkg, "package.json"), "utf8")).version;
+const platStageDir = await resolvePlatLibDir(
+  platKey, platLibCandidates, join(gameDir, "node_modules", ".cache"), platPkgVersion);
+if (!platStageDir) {
   console.error(`no libdowndraft_platform build found for ${platKey} — searched: ${platLibCandidates.join(", ")}`);
   process.exit(1);
 }
+for (const f of readdirSync(platStageDir)) {
+  if (f.endsWith(libExt)) copyFileSync(join(platStageDir, f), join(nativeDir, f));
+}
 
 // Engine cdylibs — staged if a build exists: new dist/<plat>-<arch>/ and
 // dist/ layouts (build-native.mjs), the installed @downdraft/engine package
@@ -603,6 +614,24 @@ engineCrates.forEach((crate) => {
   }
 });
 
+// Game-native libs — convention: <game>/native/dist/<platform>-<arch>/ holds
+// artifacts the game built itself (cdylib .so/.dll/.dylib loaded via the FFI
+// adapter, or .node napi addons loaded via createRequire/process.dlopen).
+// Staged flat into native/ so resolveNativeLibrary's <execDir>/native lookup
+// and execDir-relative .node resolution both hit.
+const gameNativeDir = join(gameDir, "native", "dist", platKey);
+if (existsSync(gameNativeDir)) {
+  let gameLibs = 0;
+  for (const f of readdirSync(gameNativeDir)) {
+    if (f.endsWith(libExt) || f.endsWith(".node")) {
+      copyFileSync(join(gameNativeDir, f), join(nativeDir, f));
+      staged.add(f);
+      gameLibs++;
+    }
+  }
+  if (gameLibs) console.log(`staged ${gameLibs} game-native lib(s) from ${gameNativeDir}`);
+}
+
 // Assets referenced via ?url / new URL / import.meta.glob.
 const assetRoot = join(outdir, "dd-assets");
 let stagedAssets = 0;

package/src/dev.ts

@@ -6,7 +6,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs, print, renderHelp } from "./args";
 import { formatGamesList } from "./list-games";
-import { buildCwd, findMonorepoRoot } from "./paths";
+import { buildCwd, findMonorepoRoot, readGameConfig } from "./paths";
 import { killProcessTree } from "./process-utils";
 import { getCommand } from "./usage";
 
@@ -76,8 +76,8 @@ export async function dev(args: string[]): Promise<void> {
 async function devNative(parsed: any): Promise<void> {
   const resolved = resolveGameDir();
   if (!resolved) {
-    log.error("DownDraft", `No game directory found (looking for downdraft.config.json or src/native-entry.ts from "${process.cwd()}").`);
-    log.error("DownDraft", `Run "draft dev" from a game directory.`);
+    log.error("draft", `No game directory found (looking for downdraft.config.json or src/native-entry.ts from "${process.cwd()}").`);
+    log.error("draft", `Run "draft dev" from a game directory.`);
     print(formatGamesList(findMonorepoRoot() ?? process.cwd()));
     process.exit(1);
   }
@@ -86,8 +86,8 @@ async function devNative(parsed: any): Promise<void> {
   const nativeEntry = resolve(gameDir, NATIVE_ENTRY);
 
   if (!existsSync(nativeEntry)) {
-    log.error("DownDraft", `No native entry point found at "${nativeEntry}".`);
-    log.error("DownDraft", `The game "${game}" needs a src/native-entry.ts to run on the native runtime.`);
+    log.error("draft", `No native entry point found at "${nativeEntry}".`);
+    log.error("draft", `The game "${game}" needs a src/native-entry.ts to run on the native runtime.`);
     process.exit(1);
   }
 
@@ -97,6 +97,9 @@ async function devNative(parsed: any): Promise<void> {
   const env = { ...process.env };
   const port = parsed.flags.port as number;
   if (port) env.MCP_PORT = String(port);
+  // --native-debug → the runtime resolves <plat>-<arch>-debug/ lib dirs
+  // (staged by build-native.mjs --debug) instead of release artifacts.
+  if (parsed.flags["native-debug"]) env.DD_NATIVE_PROFILE = "debug";
 
   // Signal handling lives outside the respawn loop — each spawn registers
   // itself as the current child so SIGINT/SIGTERM always hit the live one.
@@ -105,7 +108,7 @@ async function devNative(parsed: any): Promise<void> {
   const onSignal = () => {
     if (shuttingDown) return;
     shuttingDown = true;
-    log.info("DownDraft", "Shutting down...");
+    log.info("draft", "Shutting down...");
     const child = currentChild;
     try { child?.kill("SIGINT"); } catch {}
     if (child?.pid) {
@@ -126,9 +129,7 @@ async function devNative(parsed: any): Promise<void> {
   // ── Legacy path: --no-hmr spawns the entry directly under Bun (no watcher,
   //    no ModuleRunner — the pre-HMR behavior, kept as an escape hatch). ──
   if (noHmr) {
-    log.info("DownDraft", "Starting in native mode — direct spawn, no HMR (--no-hmr)...");
-    log.info("DownDraft", `  Game: ${game}`);
-    log.info("DownDraft", `  Entry: ${nativeEntry}`);
+    log.info("draft", `dev ${game} — ${nativeEntry} (bun, no hmr)`);
     const code = await spawnAndForward("bun", ["run", nativeEntry], buildCwd(gameDir), env, {
       onChild: (c) => { currentChild = c; },
     });
@@ -140,8 +141,8 @@ async function devNative(parsed: any): Promise<void> {
   const devDir = resolveDevShellDir();
   const devShell = join(devDir, "dev-shell.mjs");
   if (!existsSync(devShell)) {
-    log.error("DownDraft", `Dev shell not found at "${devShell}".`);
-    log.error("DownDraft", "Is @downdraft/platform-native installed? Try `draft dev --no-hmr` for the legacy path.");
+    log.error("draft", `Dev shell not found at "${devShell}".`);
+    log.error("draft", "Is @downdraft/platform-native installed? Try `draft dev --no-hmr` for the legacy path.");
     process.exit(1);
   }
 
@@ -149,13 +150,18 @@ async function devNative(parsed: any): Promise<void> {
   const { detectRuntime, spawnArgsFor, findDenoConfig } =
     await import(resolve(devDir, "runtime-detect.mjs"));
 
-  const requested = (parsed.flags.runtime as string | undefined) ?? process.env.DD_RUNTIME;
+  // --runtime flag → DD_RUNTIME → downdraft.config.json "runtime" → detect.
+  // (absent flags parse as "" here, so || not ??)
+  const requested = (parsed.flags.runtime as string | undefined)
+    || process.env.DD_RUNTIME
+    || (readGameConfig(gameDir).runtime as string | undefined)
+    || undefined;
   const runtime = detectRuntime(requested);
   if (!runtime) {
     if (requested) {
-      log.error("DownDraft", `Requested runtime "${requested}" is not available on PATH.`);
+      log.error("draft", `Requested runtime "${requested}" is not available on PATH.`);
     } else {
-      log.error("DownDraft", "No JS runtime found — need one of: bun, node, deno.");
+      log.error("draft", "No JS runtime found — need one of: bun, node, deno.");
     }
     process.exit(1);
   }
@@ -165,19 +171,43 @@ async function devNative(parsed: any): Promise<void> {
   env.DD_RUNTIME = runtime;
   env.DD_HMR = "1";
   env.DOWNDRAFT_DEV = "1";
-  if (verbose) env.DD_VERBOSE = "1";
+  if (verbose) {
+    env.DD_VERBOSE = "1";
+    // Diagnostics demoted below info (vite internals, pacing, gpu-registry)
+    // become visible under --verbose unless an explicit level is set.
+    env.EMBER_LOG_LEVEL = env.EMBER_LOG_LEVEL ?? "debug";
+  }
   const repoRoot = findMonorepoRoot();
   if (repoRoot) env.DD_REPO_ROOT = repoRoot;
 
+  // Engine resolution mode: "downdraft-source" resolves @downdraft/* to
+  // linked TypeScript source (per-module transforms + full engine HMR) —
+  // the default in the monorepo. Everything else resolves the pre-built
+  // dist/ tree (externalized native ESM — near-zero transform cost, no
+  // engine-file HMR). --engine-source/--engine-dist override.
+  let engineSource: boolean;
+  if (parsed.flags["engine-source"]) engineSource = true;
+  else if (parsed.flags["engine-dist"]) engineSource = false;
+  else engineSource = !!repoRoot;
+  if (!engineSource && !engineDistExists(gameDir)) {
+    log.warn("draft",
+      "engine dist/ not found — run `bun run build:dist` in the engine repo " +
+      "(or reinstall @downdraft/engine); resolving engine from source.");
+    engineSource = true;
+  }
+  env.DD_ENGINE_SOURCE = engineSource ? "1" : "";
+  env.DD_ENGINE_DIST = engineSource ? "" : "1";
+  // Deno reads export conditions from the env (flag equivalent passed to
+  // spawnArgsFor below); the var also propagates to Deno workers.
+  if (engineSource) env.DENO_CONDITIONS = "downdraft-source";
+
   const { cmd, args } = spawnArgsFor(runtime, devShell, {
     configPath: runtime === "deno" ? findDenoConfig(gameDir, repoRoot) : undefined,
+    conditions: engineSource ? ["downdraft-source"] : [],
   });
 
-  log.info("DownDraft", `Starting in native mode (${runtime} + SDL + wgpu-native, HMR on)...`);
-  log.info("DownDraft", `  Game: ${game}`);
-  log.info("DownDraft", `  Entry: ${nativeEntry}`);
-  log.info("DownDraft", `  Runtime: ${cmd} ${args.join(" ")}`);
-  if (verbose) log.info("DownDraft", "  Verbose: on");
+  log.info("draft", `dev ${game} — ${nativeEntry} (runtime=${runtime}, hmr, engine=${engineSource ? "source" : "dist"})`);
+  if (verbose) log.info("draft", `dev shell: ${cmd} ${args.join(" ")}`);
 
   // Respawn loop: the dev shell exits with DD_RESTART_EXIT when a changed
   // file affects the loader/config layer (Tier-5) — respawn in place.
@@ -187,13 +217,24 @@ async function devNative(parsed: any): Promise<void> {
     });
     if (shuttingDown) return; // signal handler already owns exit
     if (code === DD_RESTART_EXIT) {
-      log.info("DownDraft", "Restarting dev shell (infrastructure change)...");
+      log.info("draft", "Restarting dev shell (infrastructure change)...");
       continue;
     }
     process.exit(code);
   }
 }
 
+/** True when the resolved @downdraft/engine package has a pre-built dist/. */
+function engineDistExists(gameDir: string): boolean {
+  try {
+    const req = createRequire(join(gameDir, "package.json"));
+    const pkgRoot = dirname(req.resolve("@downdraft/engine/package.json"));
+    return existsSync(join(pkgRoot, "dist"));
+  } catch {
+    return false;
+  }
+}
+
 /** Spawn `cmd args`, forward stdio, resolve the exit code (signal exits are
  *  mapped to 128+n so the caller's respawn loop can distinguish them). */
 function spawnAndForward(
@@ -216,7 +257,7 @@ function spawnAndForward(
 
   return new Promise<number>((resolvePromise, reject) => {
     child.on("error", (err) => {
-      log.error("DownDraft", `Failed to spawn ${cmd}: ${err.message}`);
+      log.error("draft", `Failed to spawn ${cmd}: ${err.message}`);
       reject(err);
     });
 

package/src/index.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { createLogger } from "@downdraft/engine";
+import { createLogger, getLogTheme } from "@downdraft/engine";
 import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { ArgError, print, renderHelp } from "./args";
@@ -19,6 +19,12 @@ import { getCommand, renderTopLevelHelp } from "./usage";
 
 const log = createLogger();
 
+// Detect the log theme once against the real TTY and hand it to every
+// spawned child (dev shell, games, test runner) — their piped stdout can't
+// answer the OSC-11 probe, so without this they re-run blocking
+// gsettings/dbus probes per process. An explicit DD_LOG_THEME wins.
+process.env.DD_LOG_THEME ??= getLogTheme();
+
 // Read the CLI package version for --version output.
 function getCliVersion(): string {
   try {
@@ -53,8 +59,8 @@ async function main() {
     }
     const entry = getCommand(target);
     if (!entry) {
-      log.error("CLI", `Unknown command: ${target}`);
-      log.info("CLI", `Run 'draft --help' for the list of commands.`);
+      log.error("draft", `Unknown command: ${target}`);
+      log.info("draft", `Run 'draft --help' for the list of commands.`);
       process.exit(1);
     }
     print(renderHelp(entry.usage, entry.schema));
@@ -88,7 +94,7 @@ async function main() {
         await exportGame(process.argv.slice(3));
         break;
       case "mobile":
-        log.error("CLI", "`draft mobile` is removed — the Capacitor WebView shell was dormant and has been deleted. Mobile support returns with a native (winit+wgpu) port.");
+        log.error("draft", "`draft mobile` is removed — the Capacitor WebView shell was dormant and has been deleted. Mobile support returns with a native (winit+wgpu) port.");
         process.exit(1);
       case "assets":
         await assets(process.argv.slice(3));
@@ -103,7 +109,7 @@ async function main() {
         await pluginCommand(process.argv.slice(3));
         break;
       case "mod":
-        // `dd mod` is an alias for `dd plugin` but defaults to mod.json format.
+        // `draft mod` is an alias for `draft plugin` but defaults to mod.json format.
         await pluginCommand(["--mod", ...process.argv.slice(3)]);
         break;
       default:
@@ -112,7 +118,7 @@ async function main() {
     }
   } catch (err) {
     if (err instanceof ArgError) {
-      log.error("CLI", err.message);
+      log.error("draft", err.message);
       const entry = getCommand(command);
       if (entry) {
         print("");

package/src/mcp.ts

@@ -36,6 +36,7 @@ interface McpFlags {
     pid: number;
     url: string;
     token: string;
+    editor: boolean;
     json: boolean;
     out: string;
     maxBytes: number;
@@ -55,6 +56,7 @@ function selectorFrom(f: McpFlags): GameClientOptions {
         pid: f.pid || undefined,
         url: f.url || undefined,
         token: f.token || undefined,
+        endpoint: f.editor ? "editor" : undefined,
         timeoutMs: f.timeout || undefined,
     };
 }
@@ -218,6 +220,7 @@ export async function mcp(argv: string[]): Promise<void> {
         pid: parsed.flags.pid as number,
         url: parsed.flags.url as string,
         token: parsed.flags.token as string,
+        editor: parsed.flags.editor as boolean,
         json: parsed.flags.json as boolean,
         out: parsed.flags.out as string,
         maxBytes: (parsed.flags["max-bytes"] as number) || DEFAULT_MAX_BYTES,
@@ -236,13 +239,14 @@ export async function mcp(argv: string[]): Promise<void> {
 
     switch (action) {
         case "instances": {
-            const insts = listGameInstances({ appId: f.app || undefined });
+            let insts = listGameInstances({ appId: f.app || undefined });
+            if (f.editor) insts = insts.filter((i) => i.editorPort !== undefined);
             if (insts.length === 0) {
                 process.stderr.write("draft-mcp: no running instances\n");
                 return;
             }
             insts.forEach((i) => {
-                print(`${i.pid}\t${i.port}\t${i.appId ?? "-"}`);
+                print(`${i.pid}\t${i.port ?? "-"}\t${i.appId ?? "-"}\t${i.editorPort ?? "-"}`);
             });
             return;
         }

package/src/paths.ts

@@ -28,6 +28,23 @@ function isGameDir(dir: string): boolean {
     || existsSync(join(dir, NATIVE_ENTRY_FILE));
 }
 
+/**
+ * Read a game's `downdraft.config.json` — engine-level settings that apply
+ * regardless of the game's package.json build section. Missing/invalid files
+ * yield `{}` (the file doubles as a game-dir marker, so it may be absent).
+ *
+ *   { "runtime": "bun" | "node" | "deno" }  — default JS runtime for
+ *   `draft dev`/`draft release` (overridden by --runtime / DD_RUNTIME).
+ */
+export function readGameConfig(gameDir: string): Record<string, unknown> {
+  try {
+    const cfg = JSON.parse(readFileSync(join(gameDir, GAME_CONFIG_FILE), "utf8"));
+    return cfg && typeof cfg === "object" ? cfg : {};
+  } catch {
+    return {};
+  }
+}
+
 /**
  * Find the downdraft monorepo root — a directory whose package.json is named
  * "downdraft-engine" and contains packages/engine. Searches cwd ancestry first,

package/src/plugin-command.ts

@@ -1,9 +1,9 @@
 // ============================================================================
-// `dd plugin` — CLI subcommand for plugin management.
+// `draft plugin` — CLI subcommand for plugin management.
 //
 // Usage:
-//   dd plugin new <name> --format <format> --game <game> [options]
-//   dd plugin list [--game <game>]
+//   draft plugin new <name> --format <format> --game <game> [options]
+//   draft plugin list [--game <game>]
 // ============================================================================
 
 import { createLogger } from "@downdraft/engine";
@@ -16,8 +16,8 @@ import { scaffoldPlugin } from "./scaffold-plugin";
 const log = createLogger();
 
 export async function pluginCommand(args: string[]): Promise<void> {
-  // `dd mod new ...` injects --mod flag so scaffoldPlugin generates mod.json.
-  // `dd plugin new ...` defaults to plugin.json (legacy).
+  // `draft mod new ...` injects --mod flag so scaffoldPlugin generates mod.json.
+  // `draft plugin new ...` defaults to plugin.json (legacy).
   let modMode = false;
   if (args[0] === "--mod") {
     modMode = true;
@@ -46,7 +46,7 @@ export async function pluginCommand(args: string[]): Promise<void> {
 }
 
 async function pluginNew(args: string[], modMode: boolean): Promise<void> {
-  // Simple arg parsing: dd plugin new <name> --format <format> --game <game> [--version <ver>] [--author <name>] [--description <desc>] [--target <dir>] [--force] [--mod] [--with <ext>]
+  // Simple arg parsing: draft plugin new <name> --format <format> --game <game> [--version <ver>] [--author <name>] [--description <desc>] [--target <dir>] [--force] [--mod] [--with <ext>]
   const positional: string[] = [];
   const flags: Record<string, string | boolean> = {};
   for (let i = 0; i < args.length; i++) {
@@ -67,7 +67,7 @@ async function pluginNew(args: string[], modMode: boolean): Promise<void> {
 
   const id = positional[0];
   if (!id) {
-    log.error("plugin", `Usage: dd ${modMode ? "mod" : "plugin"} new <name> --format <format> --game <game>`);
+    log.error("plugin", `Usage: draft ${modMode ? "mod" : "plugin"} new <name> --format <format> --game <game>`);
     process.exit(1);
   }
 
@@ -190,11 +190,11 @@ function pluginList(args: string[]): void {
 function printPluginHelp(modMode: boolean): void {
   const cmd = modMode ? "mod" : "plugin";
   print(`
-dd ${cmd} — manage user-authored ${modMode ? "mods" : "plugins"}
+draft ${cmd} — manage user-authored ${modMode ? "mods" : "plugins"}
 
 Usage:
-  dd ${cmd} new <name> --format <format> --game <game> [options]
-  dd ${cmd} list [--game <game>]
+  draft ${cmd} new <name> --format <format> --game <game> [options]
+  draft ${cmd} list [--game <game>]
 
 Commands:
   new     Scaffold a new ${modMode ? "mod" : "plugin"} directory