@myvillage/cli 2.18.0 → 2.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/commands/deploy.js

@@ -11,6 +11,7 @@ import { deployGame, getGameUploadUrl, confirmGameUpload, submitGameForReview, g
 import { preflightBundles } from '../utils/preflight.js';
 import { refreshGameToolkit, gameCallsComplete } from '../utils/game-toolkit.js';
 import { selectGameVillages } from '../utils/village-resolver.js';
+import { readGitInfo } from '../utils/git-info.js';
 
 function readPackageJson(dir) {
   const pkgPath = join(dir, 'package.json');
@@ -328,6 +329,9 @@ async function deployThreeJsGame(projectDir, pkg, options = {}) {
       villageIds,
       ...(multiplayer !== undefined && { multiplayer }),
     };
+    // Team project: lets teammates deploy it and records the commit.
+    const git = readGitInfo(projectDir);
+    if (git) metadata.git = git;
     formData.append('metadata', JSON.stringify(metadata));
 
     for (const fullPath of filePaths) {
@@ -596,6 +600,8 @@ async function deployUnityPlatform(projectDir, mvConfig, platform, { gameIdOverr
     if (mvConfig.sdkVersion) metadata.sdkVersion = mvConfig.sdkVersion;
     if (platform === 'webgl') metadata.entryFile = 'index.html';
     if (Array.isArray(villageIds)) metadata.villageIds = villageIds;
+    const git = readGitInfo(projectDir);
+    if (git) metadata.git = git;
 
     formData.append('metadata', JSON.stringify(metadata));
 

package/src/utils/git-info.js

@@ -0,0 +1,80 @@
+/**
+ * The team project a game was deployed from: the `origin` remote and the
+ * current commit, read straight from .git so villagers don't need git
+ * installed (Studio's team projects use isomorphic-git, which writes a
+ * standard .git directory).
+ *
+ * MyVillage uses this to let teammates deploy a team-owned game and to record
+ * which commit each deploy was built from. Returns null when the project
+ * isn't a git repo or anything is missing.
+ */
+
+import { existsSync, readFileSync, statSync } from 'fs';
+import { join } from 'path';
+
+function readText(path) {
+  try {
+    return readFileSync(path, 'utf8');
+  } catch {
+    return null;
+  }
+}
+
+/** `[remote "origin"] url = …` from .git/config. */
+function originUrl(gitDir) {
+  const config = readText(join(gitDir, 'config'));
+  if (!config) return null;
+  let inOrigin = false;
+  for (const raw of config.split(/\r?\n/)) {
+    const line = raw.trim();
+    if (line.startsWith('[')) {
+      inOrigin = /^\[remote\s+"origin"\]$/.test(line);
+      continue;
+    }
+    const m = inOrigin && line.match(/^url\s*=\s*(.+)$/);
+    if (m) return m[1].trim();
+  }
+  return null;
+}
+
+function resolveRef(gitDir, ref) {
+  const loose = readText(join(gitDir, ref));
+  if (loose) return loose.trim();
+  const packed = readText(join(gitDir, 'packed-refs'));
+  if (!packed) return null;
+  for (const line of packed.split(/\r?\n/)) {
+    const [sha, name] = line.trim().split(' ');
+    if (name === ref) return sha;
+  }
+  return null;
+}
+
+function headSha(gitDir) {
+  const head = readText(join(gitDir, 'HEAD'))?.trim();
+  if (!head) return null;
+  const sha = head.startsWith('ref: ') ? resolveRef(gitDir, head.slice(5).trim()) : head;
+  return sha && /^[0-9a-f]{40}$/i.test(sha) ? sha.toLowerCase() : null;
+}
+
+/** Never send credentials that may be embedded in a remote URL. */
+function withoutCredentials(url) {
+  try {
+    const u = new URL(url);
+    u.username = '';
+    u.password = '';
+    return u.toString();
+  } catch {
+    return null; // scp-style (git@host:org/repo) — not a Village Git remote
+  }
+}
+
+/** { remoteUrl, commitSha } for the project's team repo, or null. */
+export function readGitInfo(projectDir) {
+  const gitDir = join(projectDir, '.git');
+  if (!existsSync(gitDir) || !statSync(gitDir).isDirectory()) return null;
+  const url = originUrl(gitDir);
+  const remoteUrl = url && withoutCredentials(url);
+  const commitSha = headSha(gitDir);
+  if (!remoteUrl || !commitSha) return null;
+  return { remoteUrl, commitSha };
+}