@downdraft/cli 0.1.0 → 0.1.2-alpha.5

package/src/release.ts

@@ -30,7 +30,7 @@ import { basename, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs, print, renderHelp } from "./args";
 import { formatGamesList, listGames } from "./list-games";
-import { findGameDirUpward, findMonorepoRoot, resolveGameDir } from "./paths";
+import { findGameDirUpward, findMonorepoRoot, readGameConfig, resolveGameDir } from "./paths";
 import { getCommand } from "./usage";
 
 const log = createLogger();
@@ -56,6 +56,8 @@ interface ReleaseArgs {
   out: string;
   retainMcp: boolean;
   verbose: boolean;
+  runtime: string | null;
+  format: string | null;
 }
 
 // ---------------------------------------------------------------------------
@@ -84,10 +86,6 @@ function parseReleaseArgs(args: string[]): ReleaseArgs {
   if (buildOnly) stage = "build";
   else if (skipBuild) stage = "package";
 
-  if (parsed.flags.format) {
-    log.warn("release", "--format is gone — native packaging produces a single binary + staged tree.");
-  }
-
   return {
     game,
     games,
@@ -103,6 +101,8 @@ function parseReleaseArgs(args: string[]): ReleaseArgs {
     out: (parsed.flags.out as string) || "release",
     retainMcp: parsed.flags.mcp as boolean,
     verbose: parsed.flags.verbose as boolean,
+    runtime: (parsed.flags.runtime as string) || null,
+    format: (parsed.flags.format as string) || null,
   };
 }
 
@@ -173,20 +173,27 @@ function classifyTargets(target: string): string[] {
 // Game info resolution
 // ---------------------------------------------------------------------------
 
-function getGameInfo(gameDir: string, game: string): { productName: string; appId: string; version: string } {
+interface GameInfo {
+  productName: string;
+  appId: string;
+  version: string;
+  /** The electron-builder-style `build` block from the game's package.json. */
+  build: Record<string, any>;
+}
+
+function getGameInfo(gameDir: string, game: string): GameInfo {
   const pkgPath = resolve(gameDir, "package.json");
-  if (!existsSync(pkgPath)) {
-    return { productName: game, appId: `com.downdraft.${game}`, version: "0.0.0" };
-  }
+  const fallback: GameInfo = { productName: game, appId: `com.downdraft.${game}`, version: "0.0.0", build: {} };
+  if (!existsSync(pkgPath)) return fallback;
   try {
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     const productName = pkg.productName ?? pkg.build?.productName ??
       String(pkg.name ?? game).replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
     const appId = pkg.build?.appId ?? `com.downdraft.${game}`;
     const version = pkg.version ?? "0.0.0";
-    return { productName, appId, version };
+    return { productName, appId, version, build: pkg.build ?? {} };
   } catch {
-    return { productName: game, appId: `com.downdraft.${game}`, version: "0.0.0" };
+    return fallback;
   }
 }
 
@@ -205,42 +212,97 @@ function packageNative(
   gameDir: string,
   targets: string[],
   opts: ReleaseArgs,
-  info: { productName: string; appId: string; version: string },
+  info: GameInfo,
 ): boolean {
   const entry = resolve(gameDir, "src/native-entry.ts");
   if (!existsSync(entry)) {
     log.error("release:package", `No src/native-entry.ts in ${gameDir} — the game has no native entry.`);
     return false;
   }
-  // The packaging script ships inside @downdraft/cli (files: ["scripts"]) so
-  // standalone game repos resolve it through the installed package, not the
-  // engine monorepo.
-  const script = fileURLToPath(new URL("../scripts/package-native.mjs", import.meta.url));
+  // The packaging scripts ship inside @downdraft/cli (files: ["scripts"]) so
+  // standalone game repos resolve them through the installed package, not
+  // the engine monorepo.
+  const scriptNative = fileURLToPath(new URL("../scripts/package-native.mjs", import.meta.url));
+  const scriptDesktop = fileURLToPath(new URL("../scripts/package-desktop.mjs", import.meta.url));
   // cwd is the relativization root for staged assets — the monorepo root
   // when present (engine sources relativize cleanly), else the game dir.
   const cwd = findMonorepoRoot(gameDir) ?? gameDir;
+
+  // Runtime matrix: --runtime flag → build.runtime in package.json →
+  // downdraft.config.json "runtime" → bun.
+  // "all" expands to the full matrix (one appdir per runtime).
+  const RUNTIMES = ["bun", "node", "deno"];
+  const requested = opts.runtime ?? info.build.runtime
+    ?? (readGameConfig(gameDir).runtime as string | undefined) ?? "bun";
+  const runtimes = requested === "all" ? RUNTIMES : [requested];
+  for (const r of runtimes) {
+    if (!RUNTIMES.includes(r)) {
+      log.error("release:package", `Unknown runtime "${r}" — expected bun, node, deno, or all.`);
+      return false;
+    }
+  }
+  // Non-bun runtimes are linux-only today — the emit-tree packaging hasn't
+  // been wired for win/mac.
+  const nonBun = runtimes.filter((r) => r !== "bun");
+  if (nonBun.length && targets.some((t) => t !== "linux")) {
+    log.warn("release:package", `--runtime=${nonBun.join(",")} is linux-only today — win/mac targets still embed bun.`);
+  }
+
   let ok = true;
   targets.forEach((target) => {
-    const outfile = resolve(opts.out, `${game}-${target}`);
-    const argv = [
-      script,
-      `--target=${target}`,
-      `--mode=${opts.mode}`,
-      `--product-name=${info.productName}`,
-      `--product-version=${info.version}`,
-      ...(opts.retainMcp ? ["--mcp"] : []),
-      entry,
-      outfile,
-    ];
-    log.info("release:package", `bun ${argv.map((a) => basename(a)).join(" ")}`);
-    const result = spawnSync("bun", argv, {
-      cwd,
-      stdio: "inherit",
-      env: process.env,
-    });
-    if (result.status !== 0) {
-      log.error("release:package", `Native packaging failed for ${game} (${target})`);
-      ok = false;
+    for (const runtime of runtimes) {
+      if (target === "linux") {
+        // Linux: package-desktop.mjs owns the format matrix (dir, deb,
+        // appimage, flatpak). Formats come from --format → build.linux.target
+        // → "dir".
+        const format = opts.format
+          ?? (Array.isArray(info.build.linux?.target) ? info.build.linux.target.join(",") : info.build.linux?.target)
+          ?? "dir";
+        const argv = [
+          scriptDesktop,
+          `--runtime=${runtime}`,
+          `--format=${format}`,
+          `--mode=${opts.mode}`,
+          `--product-name=${info.productName}`,
+          `--product-version=${info.version}`,
+          `--app-id=${info.appId}`,
+          ...(opts.retainMcp ? ["--mcp"] : []),
+          entry,
+          resolve(opts.out),
+        ];
+        log.info("release:package", `bun package-desktop.mjs --runtime=${runtime} --format=${format} ${basename(entry)}`);
+        const result = spawnSync("bun", argv, { cwd, stdio: "inherit", env: process.env });
+        if (result.status !== 0) {
+          log.error("release:package", `Packaging failed for ${game} (${target}/${runtime})`);
+          ok = false;
+        }
+        continue;
+      }
+      // win/mac: single-binary bun compile via package-native.mjs. Each
+      // target gets its own dir so the staged native/ + dd-assets/ trees
+      // don't interleave across platforms.
+      if (runtime !== "bun") continue;
+      const outfile = resolve(opts.out, `${game}-${target}`, `${game}-${target}`);
+      const argv = [
+        scriptNative,
+        `--target=${target}`,
+        `--mode=${opts.mode}`,
+        `--product-name=${info.productName}`,
+        `--product-version=${info.version}`,
+        ...(opts.retainMcp ? ["--mcp"] : []),
+        entry,
+        outfile,
+      ];
+      log.info("release:package", `bun ${argv.map((a) => basename(a)).join(" ")}`);
+      const result = spawnSync("bun", argv, {
+        cwd,
+        stdio: "inherit",
+        env: process.env,
+      });
+      if (result.status !== 0) {
+        log.error("release:package", `Native packaging failed for ${game} (${target})`);
+        ok = false;
+      }
     }
   });
   return ok;
@@ -259,7 +321,7 @@ function packageAndroid(
   game: string,
   gameDir: string,
   opts: ReleaseArgs,
-  info: { productName: string; appId: string; version: string },
+  info: GameInfo,
 ): boolean {
   const entry = resolve(gameDir, "src/native-entry.ts");
   if (!existsSync(entry)) {
@@ -340,8 +402,8 @@ export async function release(args: string[]): Promise<void> {
 
   for (let _i = 0, _it = games, _n = _it.length; _i < _n; _i++) { const game = _it[_i];
     const gameDir = resolveGameDir(game) ?? resolve(monorepoRoot ?? process.cwd(), "games", game);
-    const { productName, appId, version } = getGameInfo(gameDir, game);
-    log.info("release", `Game: ${game} | Product: "${productName}" | AppId: ${appId} | v${version}`);
+    const info = getGameInfo(gameDir, game);
+    log.info("release", `Game: ${game} | Product: "${info.productName}" | AppId: ${info.appId} | v${info.version}`);
     log.info("release", "");
 
     // Native packaging is a single compile step — build/package/release
@@ -349,8 +411,8 @@ export async function release(args: string[]): Promise<void> {
     const isAndroid = targets.every((t) => MOBILE_TARGETS.has(t));
     log.info("release", `[package] Compiling ${game} (${targets.join(", ")})...`);
     const ok = isAndroid
-      ? packageAndroid(game, gameDir, opts, { productName, appId, version })
-      : packageNative(game, gameDir, targets, opts, { productName, appId, version });
+      ? packageAndroid(game, gameDir, opts, info)
+      : packageNative(game, gameDir, targets, opts, info);
     if (!ok) {
       log.error("release", `Packaging failed for ${game} — skipping.`);
       fail = 1;

package/src/scaffold-plugin.ts

@@ -1,8 +1,8 @@
 // ============================================================================
 // Plugin scaffold — generates a new plugin directory from a template.
 //
-// Usage: `dd plugin new <name> --format <format> --game <game> [options]`
-//        `dd mod new <name> --game <game> [options]`
+// Usage: `draft plugin new <name> --format <format> --game <game> [options]`
+//        `draft mod new <name> --game <game> [options]`
 //
 // Generates:
 //   - mod.json (manifest, when --mod is used) or plugin.json (legacy)

package/src/usage.ts

@@ -46,7 +46,8 @@ export const COMMANDS: CommandEntry[] = [
         { name: "game", alias: "g", type: "string", description: "Game to release (games/<game>). For multiple games, use --games. If omitted, infers from the current directory, or defaults to the only game in games/." },
         { name: "games", type: "string", description: "Comma-separated game names (e.g. sandjongg,to-the-ocean)" },
         { name: "target", alias: "t", type: "string", default: "all", enum: [...RELEASE_TARGETS], description: "Target platform(s): win, linux, mac, android, or all (android can't mix with desktop targets)" },
-        { name: "format", type: "string", description: "Deprecated no-op — native packaging produces a single binary + staged tree" },
+        { name: "format", type: "string", description: "Package format(s), comma-separated: dir, deb, appimage, flatpak (linux only; default: build.linux.target in package.json, else dir)" },
+        { name: "runtime", type: "string", enum: ["bun", "node", "deno", "all"], description: "JS runtime embedded in the package: bun (compiled binary), node, deno, or all (default: build.runtime in package.json, \"runtime\" in downdraft.config.json, else bun). node/deno are linux-only today" },
         { name: "stage", type: "string", default: "release", enum: [...RELEASE_STAGES], description: "Stage: build, package, or release (all compile the native binary)" },
         { name: "mode", type: "string", default: "prod", enum: [...BUILD_MODES], description: "Build mode" },
         { name: "abi", type: "string", default: "arm64-v8a", description: "Android ABI(s): arm64-v8a, x86_64, or all (android target only)" },
@@ -89,10 +90,13 @@ export const COMMANDS: CommandEntry[] = [
       flags: [
         { name: "entry", type: "string", description: "Game entrypoint file (defaults to src/native-entry.ts)" },
         { name: "port", type: "number", description: "MCP HTTP port (default: auto-assign)" },
-        { name: "runtime", type: "string", enum: ["bun", "node", "deno"], description: "JS runtime hosting the dev shell (default: bun → node → deno auto-detect)" },
+        { name: "runtime", type: "string", enum: ["bun", "node", "deno"], description: "JS runtime hosting the dev shell (default: DD_RUNTIME env, \"runtime\" in downdraft.config.json, else bun → node → deno auto-detect)" },
         { name: "watch", type: "boolean", description: "Back-compat no-op — the HMR dev shell always watches" },
         { name: "no-hmr", type: "boolean", description: "Disable HMR — spawn the entry directly (bun run), no dev shell" },
+        { name: "engine-source", type: "boolean", description: "Resolve @downdraft/engine|platform-native from linked TypeScript source (default in the monorepo; enables file-level engine HMR)" },
+        { name: "engine-dist", type: "boolean", description: "Resolve engine packages from their pre-built dist/ tree (default outside the monorepo; externalized = near-zero transform cost, no engine-file HMR)" },
         { name: "native", type: "boolean", description: "Back-compat alias — native is the default runtime" },
+        { name: "native-debug", type: "boolean", description: "Load debug native libraries (built via build-native.mjs --debug) — sets DD_NATIVE_PROFILE=debug for the spawned runtime" },
         { name: "verbose", alias: "v", type: "boolean", description: "Verbose logging" },
       ],
     },
@@ -195,6 +199,7 @@ export const COMMANDS: CommandEntry[] = [
         { name: "pid", type: "number", description: "Select instance by PID" },
         { name: "url", type: "string", description: "Explicit MCP HTTP URL (skips PID-file discovery)" },
         { name: "token", type: "string", description: "Bearer token (auto-read from <pid>.token otherwise)" },
+        { name: "editor", type: "boolean", description: "Target the instance's editor endpoint (<pid>.editor — createMcpModule transport:\"http\") instead of the automation endpoint" },
         { name: "json", type: "boolean", description: "Print the raw result envelope (image data elided to {bytes} unless --out)" },
         { name: "out", type: "string", description: "Write image/binary result blocks to file(s)" },
         { name: "max-bytes", type: "number", description: "Cap printed output in bytes (default 262144)" },

package/templates/_shared/partials/config-json-fields.eta

@@ -1,3 +1,2 @@
   "name": "<%= it.name %>",
-  "version": "<%= it.version %>",
-  "engine": "downdraft"
+  "version": "<%= it.version %>"