@myvillage/cli 1.64.6 → 1.64.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.64.6",
+  "version": "1.64.7",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {
@@ -39,6 +39,7 @@
     "open": "^10.0.3",
     "ora": "^8.0.1",
     "p-limit": "^5.0.0",
+    "tar": "^7.5.16",
     "update-notifier": "^7.0.0",
     "yaml": "^2.3.0",
     "zod": "^3.22.0"

package/src/commands/create-game.js

@@ -214,9 +214,15 @@ async function createUnityGame(options = {}) {
     console.log();
     console.log(brand.green(`  \u2713 Unity game "${answers.name}" created!`));
     console.log(brand.teal(`     Unity: ${scaffold.unityVersion}`));
-    console.log(brand.teal(`     GameKit SDK: ${scaffold.sdkVersion}`));
+    console.log(brand.teal(`     GameKit SDK: ${scaffold.sdkVersion}${scaffold.sdkEmbedded ? ' (bundled — no git needed)' : ''}`));
     console.log(brand.teal(`     Orientation: ${orientation} (${orientation === 'landscape' ? 'web only' : 'muni mobile + web'})`));
     console.log();
+    if (!scaffold.sdkEmbedded) {
+      console.log(chalk.yellow('  ⚠ Could not download the GameKit SDK (offline?). The project falls back to a'));
+      console.log(chalk.yellow('    git-URL dependency, so opening it in Unity will require git to be installed.'));
+      console.log(chalk.yellow('    Re-run this command with a network connection to bundle the SDK locally instead.'));
+      console.log();
+    }
     console.log(brand.teal('  Next steps:'));
     console.log();
     console.log(`    1. ${brand.gold('Open this project in Unity Hub')} (Add \u2192 Add project from disk)`);

package/src/utils/templates.js

@@ -1,7 +1,9 @@
-import { mkdirSync, writeFileSync, copyFileSync, existsSync } from 'fs';
+import { mkdirSync, writeFileSync, copyFileSync, existsSync, rmSync } from 'fs';
 import { join, dirname } from 'path';
+import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
 import { randomUUID } from 'crypto';
+import * as tar from 'tar';
 
 // Bundled starter cover art lives at src/assets/game-art/ (this file is at
 // src/utils/). Resolved from the module path so it also works once the CLI is
@@ -14,6 +16,14 @@ const GAMEKIT_SDK_VERSION = '1.1.0-alpha.4';
 const GAMEKIT_SDK_URL =
   `https://github.com/MyVillage-Project-Technologies/myvillage-gamekit.git#v${GAMEKIT_SDK_VERSION}`;
 
+// Direct (no-auth, no-redirect) tarball of the pinned tag. We download and
+// unpack this into Packages/com.myvillage.gamekit/ at scaffold time so the
+// project opens as a *local embedded package* — Unity never has to shell out to
+// `git` to resolve the SDK. This is the fix for the "No 'git' executable was
+// found" Package Manager error developers hit with a git-URL dependency.
+const GAMEKIT_SDK_TARBALL_URL =
+  `https://codeload.github.com/MyVillage-Project-Technologies/myvillage-gamekit/tar.gz/refs/tags/v${GAMEKIT_SDK_VERSION}`;
+
 // Fallback Unity Editor version used only if we can't fetch the SDK's
 // package.json at scaffold time. The SDK declares the recommended editor
 // version via `unity` + `unityRelease` fields — that's the source of truth.
@@ -41,6 +51,38 @@ async function resolveUnityVersion() {
   }
 }
 
+// Download the pinned GameKit SDK tarball over HTTPS and unpack it into
+// Packages/com.myvillage.gamekit/ so Unity treats it as a local embedded
+// package — no `git` executable required to resolve it. Returns true on
+// success; false (with the partial dir cleaned up) on any failure so the
+// caller can fall back to the git-URL manifest entry and still scaffold.
+async function embedGameKitSdk(targetDir) {
+  const pkgDir = join(targetDir, 'Packages', 'com.myvillage.gamekit');
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 20000);
+  let tmpFile;
+  try {
+    const res = await fetch(GAMEKIT_SDK_TARBALL_URL, { signal: controller.signal });
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    const buf = Buffer.from(await res.arrayBuffer());
+    tmpFile = join(tmpdir(), `gamekit-${randomUUID()}.tar.gz`);
+    writeFileSync(tmpFile, buf);
+    mkdirSync(pkgDir, { recursive: true });
+    // strip:1 drops GitHub's top-level "<owner>-<repo>-<sha>/" wrapper folder
+    // so package.json lands at the root of pkgDir.
+    await tar.extract({ file: tmpFile, cwd: pkgDir, strip: 1 });
+    // Sanity check: a valid UPM package has package.json at its root.
+    if (!existsSync(join(pkgDir, 'package.json'))) throw new Error('package.json missing after extract');
+    return true;
+  } catch {
+    rmSync(pkgDir, { recursive: true, force: true });
+    return false;
+  } finally {
+    clearTimeout(timeout);
+    if (tmpFile) rmSync(tmpFile, { force: true });
+  }
+}
+
 // MyVillage brand colors
 const BRAND = {
   gold: '#FFD700',
@@ -1135,7 +1177,7 @@ function generateUnityAgents(name, className, orientation) {
   return [
     '# AGENTS.md — working on this MyVillage Unity game with an AI agent',
     '',
-    '**' + name + '** is a MyVillage Unity game built on the **MyVillage GameKit SDK** (a UPM package pinned in `Packages/manifest.json`). The mission is C#; it builds to AssetBundles the M-UNI host loads.',
+    '**' + name + '** is a MyVillage Unity game built on the **MyVillage GameKit SDK** (bundled as a local UPM package in `Packages/com.myvillage.gamekit/` — no git needed to open the project). The mission is C#; it builds to AssetBundles the M-UNI host loads.',
     '',
     'When editing: change the mission logic, keep the **game contract** intact (`CompleteMission` / `FailMission`), and do not break the GameKit `MissionBase` lifecycle.',
     '',
@@ -1151,7 +1193,8 @@ function generateUnityAgents(name, className, orientation) {
     '|------|---------|',
     '| `Assets/Scripts/' + className + '.cs` | **Your mission** — the `MissionBase` subclass. Edit here. |',
     '| `Assets/Editor/MyVillageOrientation.cs` | Pins player orientation on first load. |',
-    '| `Packages/manifest.json` | Depends on the GameKit SDK (pinned version). Do not hand-edit the SDK. |',
+    '| `Packages/com.myvillage.gamekit/` | The GameKit SDK, bundled as a local package. Do not hand-edit it. |',
+    '| `Packages/manifest.json` | Unity registry packages (URP, TMP, Input System, …). |',
     '| `myvillage.json` | Game metadata the CLI/deploy reads (slug, gameType, orientation, assets). |',
     '| `assets/` | Cover art shipped on deploy (thumbnail/banner). |',
     '| `builds/{ios,android,webgl}/` | Drop-zone for built AssetBundles the CLI deploys. |',
@@ -1181,7 +1224,7 @@ function generateUnityAgents(name, className, orientation) {
     '',
     '## Gotchas',
     '',
-    '- Do not edit the GameKit SDK package — it is a pinned dependency. Use its `MissionBase` API.',
+    '- Do not edit the GameKit SDK package — it is bundled in `Packages/com.myvillage.gamekit/`. Use its `MissionBase` API. To change SDK version, re-scaffold or replace that folder; do not patch it in place.',
     '- Visual Scripting reflection nodes (`InvokeMember`/`GetMember`/`SetMember`) are rejected by the deploy preflight. Write C# instead.',
     '',
   ].join('\n');
@@ -1199,12 +1242,14 @@ export async function createUnityGameProject(targetDir, options) {
   const isLandscape = orientation === 'landscape';
   const primaryGameType = isLandscape ? 'UNITY_WEBGL' : 'UNITY_NATIVE';
 
-  // Scaffold an openable Unity project that pulls com.myvillage.gamekit via UPM.
+  // Scaffold an openable Unity project with com.myvillage.gamekit bundled in
+  // as a local embedded package (downloaded over HTTPS, no git required).
   // Layout matches what Unity Hub expects:
-  //   Packages/manifest.json       - dependency on the GameKit SDK + core modules
+  //   Packages/com.myvillage.gamekit/    - the GameKit SDK, embedded locally
+  //   Packages/manifest.json             - Unity registry deps (URP, TMP, …)
   //   ProjectSettings/ProjectVersion.txt - tells Unity which editor version
-  //   Assets/Scripts/<Name>.cs     - starter MissionBase subclass
-  //   builds/{ios,android,webgl}/  - drop-zone for builds the CLI deploys
+  //   Assets/Scripts/<Name>.cs           - starter MissionBase subclass
+  //   builds/{ios,android,webgl}/        - drop-zone for builds the CLI deploys
 
   const dirs = [
     '',
@@ -1249,8 +1294,15 @@ export async function createUnityGameProject(targetDir, options) {
     lastDeployed: null,
   }, null, 2) + '\n');
 
-  // Unity project files.
-  writeFileSync(join(targetDir, 'Packages/manifest.json'), generateUnityPackagesManifest());
+  // Bundle the GameKit SDK as a local package so the project opens without git.
+  // If the download fails (e.g. offline), fall back to the git-URL dependency in
+  // the manifest — that path still works for anyone who has git installed.
+  const sdkEmbedded = await embedGameKitSdk(targetDir);
+
+  // Unity project files. When the SDK is embedded it must NOT also be listed as
+  // a manifest dependency (Unity would try to re-resolve it); when it isn't, the
+  // git-URL entry is the fallback resolution path.
+  writeFileSync(join(targetDir, 'Packages/manifest.json'), generateUnityPackagesManifest(sdkEmbedded));
   writeFileSync(join(targetDir, 'ProjectSettings/ProjectVersion.txt'), generateUnityProjectVersion(unityVersion));
 
   // Starter mission. New devs subclass MissionBase here.
@@ -1271,7 +1323,7 @@ export async function createUnityGameProject(targetDir, options) {
   writeFileSync(join(targetDir, 'README.md'), generateUnityReadme(name, slug, className, orientation, unityVersion));
   writeFileSync(join(targetDir, 'AGENTS.md'), generateUnityAgents(name, className, orientation));
 
-  return { unityVersion, sdkVersion: GAMEKIT_SDK_VERSION, gameType: primaryGameType };
+  return { unityVersion, sdkVersion: GAMEKIT_SDK_VERSION, gameType: primaryGameType, sdkEmbedded };
 }
 
 // Editor script: applies orientation to PlayerSettings on first load so a
@@ -1315,18 +1367,23 @@ public static class MyVillageOrientation
 
 // ── Unity (GameKit SDK) ─────────────────────────────────────────────
 
-function generateUnityPackagesManifest() {
-  return JSON.stringify({
-    dependencies: {
-      'com.myvillage.gamekit': GAMEKIT_SDK_URL,
-      'com.unity.feature.development': '1.0.2',
-      'com.unity.render-pipelines.universal': '17.2.0',
-      'com.unity.textmeshpro': '3.0.6',
-      'com.unity.inputsystem': '1.14.2',
-      'com.unity.ide.rider': '3.0.38',
-      'com.unity.ide.visualstudio': '2.0.22',
-    },
-  }, null, 2) + '\n';
+function generateUnityPackagesManifest(sdkEmbedded = true) {
+  const dependencies = {};
+  // Only declare the SDK as a git dependency when it could NOT be embedded
+  // locally. When embedded under Packages/com.myvillage.gamekit/, Unity
+  // auto-discovers it and listing it here would force a (git-based) re-resolve.
+  if (!sdkEmbedded) {
+    dependencies['com.myvillage.gamekit'] = GAMEKIT_SDK_URL;
+  }
+  Object.assign(dependencies, {
+    'com.unity.feature.development': '1.0.2',
+    'com.unity.render-pipelines.universal': '17.2.0',
+    'com.unity.textmeshpro': '3.0.6',
+    'com.unity.inputsystem': '1.14.2',
+    'com.unity.ide.rider': '3.0.38',
+    'com.unity.ide.visualstudio': '2.0.22',
+  });
+  return JSON.stringify({ dependencies }, null, 2) + '\n';
 }
 
 function generateUnityProjectVersion(unityVersion) {
@@ -1450,24 +1507,25 @@ A MyVillage game scaffolded with the MyVillage CLI and the MyVillage GameKit SDK
 - **Slug:** \`${slug}\`
 - **Game type:** \`${gameType}\`
 - **Orientation:** \`${orientation}\` — plays on ${reach}
-- **SDK:** \`com.myvillage.gamekit\` (pinned in \`Packages/manifest.json\`)
+- **SDK:** \`com.myvillage.gamekit\` v${GAMEKIT_SDK_VERSION} (bundled in \`Packages/com.myvillage.gamekit/\` \u2014 no git required)
 
 ## What's in this project
 
 \`\`\`
 Assets/
 \u2514\u2500\u2500 Scripts/
-    \u2514\u2500\u2500 ${className}.cs       \u2190 your mission, subclasses MissionBase
+    \u2514\u2500\u2500 ${className}.cs               \u2190 your mission, subclasses MissionBase
 Packages/
-\u2514\u2500\u2500 manifest.json         \u2190 fetches the GameKit SDK on first open
+\u251c\u2500\u2500 com.myvillage.gamekit/        \u2190 GameKit SDK, bundled locally
+\u2514\u2500\u2500 manifest.json                 \u2190 Unity registry packages (URP, TMP, \u2026)
 ProjectSettings/
 \u2514\u2500\u2500 ProjectVersion.txt
-myvillage.json               \u2190 CLI metadata (auto-updated by deploy)
+myvillage.json                       \u2190 CLI metadata (auto-updated by deploy)
 \`\`\`
 
 ## Quickstart \u2014 play your mission in 3 steps
 
-1. **Install Unity Hub** and Unity **${unityVersion}** if you don't have it. Open this folder in Unity Hub (Add \u2192 Add project from disk). Unity fetches the GameKit SDK automatically (check Package Manager \u2192 In Project).
+1. **Install Unity Hub** and Unity **${unityVersion}** if you don't have it. Open this folder in Unity Hub (Add \u2192 Add project from disk). The GameKit SDK is already bundled in \`Packages/\`, so the project compiles on first open \u2014 you do **not** need git installed.
 
 2. **Click the menu \`MyVillage \u2192 Create Starter Mission Scene\`.** This creates a new scene with a "Mission" GameObject that already has \`MockMissionHost\` attached (the editor stand-in for the real M-UNI host) and your \`${className}\` script auto-attached. The scene is added to Build Settings and opened for you.