@genex-ai/cli-demo 1.6.6-dev.439 → 1.6.7-dev.440

package/dist/index.js

@@ -2045,13 +2045,13 @@ async function runLink(opts) {
   log.dim(`  saved ${c.cyan(metaPath)}`);
   await writeGameConfigFiles(meta, log);
   await ensureSlugEnv(project.slug, log);
+  const remote = await readRemoteSource(apiUrl, token, project.id);
+  if (remote?.stagingCommit) meta.stagingCommit = remote.stagingCommit;
   if (cloned) {
-    const remote = await readRemoteSource(apiUrl, token, project.id);
     const tree = await sourceTreeHash(process.cwd());
-    if (remote?.stagingCommit) meta.stagingCommit = remote.stagingCommit;
     if (tree) meta.sourceTree = tree;
-    await writeProject(meta);
   }
+  await writeProject(meta);
   log.plain("");
   log.success(
     `Linked. This folder now updates ${c.cyan(project.slug)} \u2014 \`npx genex preview\` / \`publish\` ship to the same live game.`
@@ -2208,7 +2208,7 @@ 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")} 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`);
+      log.dim(`  ${c.cyan("npx genex pull --force")} takes the draft and keeps a copy of what is here`);
       process.exitCode = 1;
       return;
     }
@@ -2233,7 +2233,13 @@ async function runPull(opts) {
       return;
     }
     await fs13.rm(path13.join(fresh, ".git"), { recursive: true, force: true });
+    const kept = await keepReplaced(cwd, log);
     await replaceTree(cwd, fresh);
+    if (kept) {
+      log.plain("");
+      log.info(`What was here is kept at ${c.cyan(path13.relative(cwd, kept) || kept)}`);
+      log.dim("  Nothing was thrown away \u2014 re-apply from there, or delete it when you are done.");
+    }
   } finally {
     await fs13.rm(staging, { recursive: true, force: true }).catch(() => {
     });
@@ -2252,6 +2258,23 @@ async function runPull(opts) {
   log.success(`Pulled ${c.cyan(meta.slug)}${grant.sourceRef === "preview" ? " (draft)" : ""}.`);
   log.dim(`  Run ${c.cyan("npm install")} if dependencies changed, then keep building.`);
 }
+async function keepReplaced(cwd, log) {
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const dest = path13.join(cwd, ".genex", `replaced-${stamp}`);
+  try {
+    const entries = (await fs13.readdir(cwd)).filter((e) => !isMachineLocal(e));
+    if (entries.length === 0) return null;
+    await fs13.mkdir(dest, { recursive: true });
+    for (const entry of entries) {
+      await fs13.cp(path13.join(cwd, entry), path13.join(dest, entry), { recursive: true });
+    }
+    return dest;
+  } catch (err) {
+    log.warn("Couldn't keep a copy of what's being replaced \u2014 continuing with the pull.");
+    log.dim(`  ${String(err)}`);
+    return null;
+  }
+}
 async function replaceTree(dest, src) {
   for (const entry of await fs13.readdir(dest)) {
     if (isMachineLocal(entry)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genex-ai/cli-demo",
-  "version": "1.6.6-dev.439",
+  "version": "1.6.7-dev.440",
   "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

@@ -182,9 +182,23 @@ overwriting the other one, and tells you both ways forward:
   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.
+**Prefer taking their work and redoing yours on top.** You know what you just
+changed, so you can re-apply it — which no merge tool could do for you, and which
+loses nothing:
+
+```bash
+npx genex pull --force   # takes their version; keeps what was here under .genex/replaced-*
+# redo your change on the new base, then:
+npx genex preview
+```
+
+`pull --force` never deletes: what was in the folder is copied to
+`.genex/replaced-<timestamp>/` first, so you can diff against it while re-applying.
+
+Use `preview --force` instead only when the user says their side should win.
+Either way **say which version you are keeping before you run it** — both commands
+are irreversible for one side, and the user may know something you don't about what
+is on the other machine.
 
 `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