@genex-ai/cli-demo 1.6.5-dev.434 → 1.6.6-dev.435

package/dist/index.js

@@ -1886,7 +1886,8 @@ function reportStale(log, slug, local, remote) {
   if (remote && local) {
     log.dim(`  the draft is on ${remote.slice(0, 7)}, this folder last shipped ${local.slice(0, 7)}`);
   }
-  log.dim(`  Run ${c.cyan("npx genex pull")} to get that work, then run this again.`);
+  log.dim(`  ${c.cyan("npx genex pull")} \u2014 take the other device's work (refuses if you have unshipped changes)`);
+  log.dim(`  ${c.cyan("npx genex preview --force")} \u2014 keep yours and replace theirs`);
 }
 async function sourceTreeHash(cwd) {
   const gitDir = await fs11.mkdtemp(path11.join(os6.tmpdir(), "genex-tree-"));
@@ -2206,7 +2207,8 @@ async function runPull(opts) {
     }
     if (tree2 !== meta.sourceTree) {
       log.error("This folder has changes that were never deployed.");
-      log.dim(`  ${c.cyan("npx genex preview")} saves them first, or ${c.cyan("npx genex pull --force")} discards them.`);
+      log.dim(`  ${c.cyan("npx genex preview")} ships them first (add ${c.cyan("--force")} if it says another device updated this)`);
+      log.dim(`  ${c.cyan("npx genex pull --force")} throws them away and takes the draft`);
       process.exitCode = 1;
       return;
     }
@@ -4701,7 +4703,7 @@ function isSecretEnvFile(name) {
 async function deployGame(ctx, opts, log) {
   const cwd = process.cwd();
   const meta = await readProject(cwd);
-  const expectStagingCommit = meta?.stagingCommit;
+  const expectStagingCommit = opts.force ? void 0 : meta?.stagingCommit;
   if (expectStagingCommit) {
     const remote = await readRemoteSource(ctx.apiUrl, ctx.token, ctx.projectId);
     if (remote && isStale(expectStagingCommit, remote.stagingCommit)) {
@@ -6119,6 +6121,7 @@ async function runPublish(opts) {
         // staging — the owner would publish and then see a stale game.
         channel: "staging",
         noBuild: opts.noBuild,
+        force: opts.force,
         matchmaking: detections.matchmaking,
         embedSdkVersion: detections.embedSdkVersion,
         multiplayer: detections.multiplayer,
@@ -6223,6 +6226,7 @@ async function runPreview(opts) {
       // was inside, and the only protection was a warning line below.
       channel: "staging",
       noBuild: opts.noBuild,
+      force: opts.force,
       matchmaking: detections.matchmaking,
       embedSdkVersion: detections.embedSdkVersion,
       multiplayer: detections.multiplayer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genex-ai/cli-demo",
-  "version": "1.6.5-dev.434",
+  "version": "1.6.6-dev.435",
   "description": "Set up your project's agent workspace (.claude/.codex/.cursor in the game folder), authorize, create a game project, generate AI assets, and publish (genex CLI).",
   "type": "module",
   "bin": {

package/templates/skills/genex-getting-started/SKILL.md

@@ -150,23 +150,41 @@ If unsure, use `games` (also the server's fallback for anything unrecognized).
 Your own files were left untouched. `genex init` only adds missing files and
 refreshes the genex-owned ones.
 
-## Reconnecting an existing game (`genex link`)
+## Working on one game from more than one machine
 
-Each game's connection to its live page is folder-local (`.genex/project.json`).
-If that folder is gone — deleted, or the game
-was built on another machine — **don't run `init` to "recover" it**: that
-creates a brand-new game at a new URL. Instead, clone the game's source repo
-and re-link the clone to the same live game:
+A game's connection to its live page is folder-local (`.genex/project.json`), so
+a new machine — or a folder that got deleted — has no link. **Never run `init`
+to "recover" a game**: that creates a brand-new game at a new URL.
+
+**Picking the game up somewhere new** — run `link` in an EMPTY folder and it
+downloads the game too, binary assets and all:
 
 ```bash
-git clone <the game's repo url> my-game && cd my-game
-npm install
+mkdir my-game && cd my-game
 npx @genex-ai/cli-demo@dev link <slug>   # slug = the name in the play URL
+npm install
 ```
 
 Don't know the slug? **`npx genex list`** prints every game on your account —
-slug, status, and page link for each — signing you in first if needed. Find the
-game there, then `link` its slug.
+slug, status, and page link for each. In a folder that already has files, `link`
+writes the link and downloads nothing, so it can never overwrite work.
+
+**Catching a folder up** — `npx genex pull` replaces this folder with the
+game's current draft. It refuses if the folder holds changes you never deployed,
+because there is nothing to merge them against.
+
+**If two machines have both moved on**, `preview` refuses rather than
+overwriting the other one, and tells you both ways forward:
+
+```
+✗ my-game was updated from another device — nothing was deployed.
+  npx genex pull — take the other device's work (refuses if you have unshipped changes)
+  npx genex preview --force — keep yours and replace theirs
+```
+
+Pick one deliberately: `pull` throws away what is in this folder, `--force`
+throws away what the other machine put on staging. **Ask the user which**, and
+say plainly which side is about to be lost — don't guess for them.
 
 `link` never creates a project: it signs in if needed (the browser opens once)
 and rewrites the local link (source pushes authorize over HTTPS, so there's no