vibemancer 1.0.34 → 1.0.36

package/dist/cli.js

@@ -1199,7 +1199,7 @@ async function listMyBotsPage() {
     truncated: obj.truncated === true
   };
 }
-async function pullSource(name) {
+async function pullBot(name) {
   const token = await getAccessToken();
   const res = await fetch(`${MCP_BASE_URL}/api/pull?name=${encodeURIComponent(name)}`, {
     headers: { Authorization: `Bearer ${token}`, ...envHeaders() },
@@ -1208,10 +1208,16 @@ async function pullSource(name) {
   if (!res.ok) throw new Error(`Pull failed (${res.status}): ${await res.text()}`);
   const data = await res.json();
   const source = typeof data === "object" && data !== null && "sourceCode" in data && typeof data.sourceCode === "string" ? data.sourceCode : "";
-  if (source) return source;
+  if (source) {
+    const canonical = typeof data === "object" && data !== null && "name" in data && typeof data.name === "string" && data.name ? data.name : name;
+    return { sourceCode: source, name: canonical };
+  }
   const error = typeof data === "object" && data !== null && "error" in data && typeof data.error === "string" ? data.error : "No source returned.";
   throw new Error(error);
 }
+async function pullSource(name) {
+  return (await pullBot(name)).sourceCode;
+}
 
 // src/commands/bots.ts
 async function runBots(options) {
@@ -1370,7 +1376,52 @@ function getStyleDescription(bot) {
 }
 
 // src/commands/upload.ts
+import fs6 from "fs";
+
+// src/pull-safety.ts
+import { createHash } from "crypto";
 import fs5 from "fs";
+import path6 from "path";
+function hashContent(content) {
+  const normalised = content.replace(/\r\n/g, "\n").replace(/\s+$/, "");
+  return createHash("sha256").update(normalised, "utf8").digest("hex");
+}
+function pullDecision(situation) {
+  if (!situation.fileExists) return "write";
+  if (situation.force) return "write";
+  const local = situation.localContent ?? "";
+  if (hashContent(local) === hashContent(situation.incomingContent)) return "skip-identical";
+  if (situation.recordedHash === void 0) return "refuse-unknown";
+  return hashContent(local) === situation.recordedHash ? "write" : "refuse-modified";
+}
+var STATE_FILE = ".vibemancer-state.json";
+function statePath(projectDir) {
+  return path6.join(projectDir, STATE_FILE);
+}
+function readState(projectDir) {
+  try {
+    const parsed = JSON.parse(fs5.readFileSync(statePath(projectDir), "utf-8"));
+    if (typeof parsed !== "object" || parsed === null) return {};
+    const out = {};
+    for (const [k, v] of Object.entries(parsed)) if (typeof v === "string") out[k] = v;
+    return out;
+  } catch {
+    return {};
+  }
+}
+function recordedHashFor(projectDir, filePath) {
+  return readState(projectDir)[path6.relative(projectDir, filePath).split(path6.sep).join("/")];
+}
+function recordWritten(projectDir, filePath, content) {
+  try {
+    const state = readState(projectDir);
+    state[path6.relative(projectDir, filePath).split(path6.sep).join("/")] = hashContent(content);
+    fs5.writeFileSync(statePath(projectDir), JSON.stringify(state, null, 2) + String.fromCharCode(10));
+  } catch {
+  }
+}
+
+// src/commands/upload.ts
 var MAX_BUNDLE_BYTES = 500 * 1024;
 async function runUpload(options) {
   const projectDir = process.cwd();
@@ -1386,7 +1437,7 @@ async function runUpload(options) {
   }
   let sourceCode = "";
   try {
-    sourceCode = fs5.readFileSync(botInfo.sourcePath, "utf-8");
+    sourceCode = fs6.readFileSync(botInfo.sourcePath, "utf-8");
   } catch {
   }
   console.log(`  Wizard: ${botInfo.exportName}`);
@@ -1399,6 +1450,7 @@ async function runUpload(options) {
       sourceCode,
       active: options.active
     });
+    if (sourceCode) recordWritten(process.cwd(), botInfo.sourcePath, sourceCode);
     console.log(`  \u2713 ${result.message}`);
     if (result.wizardId) console.log(`  Wizard ID: ${result.wizardId}`);
     console.log(result.active === false ? `  "${botInfo.exportName}" is retired and no longer competing.
@@ -1416,20 +1468,20 @@ async function runUpload(options) {
 }
 
 // src/commands/pull.ts
-import fs6 from "fs";
-import path6 from "path";
+import fs7 from "fs";
+import path7 from "path";
 function pullTargetPath(projectDir, name) {
   const trimmed = name.trim();
   if (!trimmed) throw new Error("A bot name is required.");
   if (/[\u0000-\u001f\u007f]/.test(trimmed)) throw new Error(`Refusing a bot name with a control character: ${JSON.stringify(name)}`);
-  if (trimmed !== path6.basename(trimmed) || trimmed === "." || trimmed === ".." || trimmed.includes("/") || trimmed.includes("\\")) {
+  if (trimmed !== path7.basename(trimmed) || trimmed === "." || trimmed === ".." || trimmed.includes("/") || trimmed.includes("\\")) {
     throw new Error(`Refusing a bot name that is not a plain file name: ${JSON.stringify(name)}`);
   }
-  return path6.resolve(projectDir, "src", `${trimmed}.ts`);
+  return path7.resolve(projectDir, "src", `${trimmed}.ts`);
 }
 function readProjectConfig(projectDir) {
   try {
-    const raw = fs6.readFileSync(path6.join(projectDir, "vibemancer.json"), "utf-8");
+    const raw = fs7.readFileSync(path7.join(projectDir, "vibemancer.json"), "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null) return void 0;
     const bot = parsed.bot;
@@ -1448,23 +1500,47 @@ function pullDestination(projectDir, name, config) {
   const configuredExport = config?.export;
   if (!configured) return { path: fallback };
   if (configuredExport && configuredExport.toLowerCase() === name.trim().toLowerCase()) {
-    return { path: path6.resolve(projectDir, configured) };
+    return { path: path7.resolve(projectDir, configured) };
   }
   return {
     path: fallback,
     warning: `Note: this project's vibemancer.json uses ${configuredExport ?? "another bot"} (${configured}), so upload/fight will keep using that, not the file just written.`
   };
 }
-async function pullByName(projectDir, name) {
-  const destination = pullDestination(projectDir, name, readProjectConfig(projectDir));
-  const target = destination.path;
-  const isNew = !fs6.existsSync(target);
+async function pullByName(projectDir, name, force) {
+  pullTargetPath(projectDir, name);
   console.log("");
   console.log(`  Pulling latest source for ${name}...`);
   try {
-    const sourceCode = await pullSource(name);
-    fs6.mkdirSync(path6.dirname(target), { recursive: true });
-    fs6.writeFileSync(target, sourceCode);
+    const pulled = await pullBot(name);
+    const sourceCode = pulled.sourceCode;
+    const destination = pullDestination(projectDir, pulled.name, readProjectConfig(projectDir));
+    const target = destination.path;
+    const isNew = !fs7.existsSync(target);
+    const decision = pullDecision({
+      fileExists: !isNew,
+      localContent: isNew ? void 0 : fs7.readFileSync(target, "utf-8"),
+      incomingContent: sourceCode,
+      recordedHash: recordedHashFor(projectDir, target),
+      force
+    });
+    if (decision === "skip-identical") {
+      console.log(`  Already up to date: ${target}`);
+      recordWritten(projectDir, target, sourceCode);
+      return;
+    }
+    if (decision !== "write") {
+      const why = decision === "refuse-modified" ? "it has changes that were not pulled or uploaded from here" : "this CLI has never written it, so it may be work it did not create";
+      console.error("");
+      console.error(`  Refusing to overwrite ${target}: ${why}.`);
+      console.error("  Save or commit it first, or re-run with --force to replace it.");
+      console.error("");
+      process.exitCode = 1;
+      return;
+    }
+    fs7.mkdirSync(path7.dirname(target), { recursive: true });
+    fs7.writeFileSync(target, sourceCode);
+    recordWritten(projectDir, target, sourceCode);
     console.log(`  \u2713 ${isNew ? "Created" : "Updated"} ${target}`);
     console.log(`  ${(sourceCode.length / 1024).toFixed(1)} KB written`);
     if (destination.warning) console.log(`  ${destination.warning}`);
@@ -1487,17 +1563,17 @@ function reportPullFailure(err, name) {
 async function runPull(options) {
   const projectDir = process.cwd();
   if (options.name) {
-    await pullByName(projectDir, options.name);
+    await pullByName(projectDir, options.name, options.force === true);
     return;
   }
   const botInfo = await discoverBot(projectDir, options.bot, { allowMissingFile: true });
-  const isNew = !fs6.existsSync(botInfo.sourcePath);
+  const isNew = !fs7.existsSync(botInfo.sourcePath);
   console.log(`
   Pulling latest source for ${botInfo.exportName}...`);
   try {
     const sourceCode = await pullSource(botInfo.exportName);
-    fs6.mkdirSync(path6.dirname(botInfo.sourcePath), { recursive: true });
-    fs6.writeFileSync(botInfo.sourcePath, sourceCode);
+    fs7.mkdirSync(path7.dirname(botInfo.sourcePath), { recursive: true });
+    fs7.writeFileSync(botInfo.sourcePath, sourceCode);
     console.log(`  \u2713 ${isNew ? "Created" : "Updated"} ${botInfo.sourcePath}`);
     console.log(`  ${(sourceCode.length / 1024).toFixed(1)} KB written`);
   } catch (err) {
@@ -1722,8 +1798,8 @@ function runMissileCalc(options) {
 
 // src/auth/telemetry.ts
 import os2 from "os";
-import fs7 from "fs";
-import path7 from "path";
+import fs8 from "fs";
+import path8 from "path";
 var TIMEOUT_MS = 1e3;
 function isTelemetryEnabled(env) {
   const off = (value) => {
@@ -1743,13 +1819,13 @@ function isTelemetryEnabled(env) {
 }
 var TELEMETRY_NOTICE = "  Vibemancer records which commands are run, your OS and version numbers, to decide\n  which platforms to support. No code, file paths or personal files are ever sent.\n  Opt out any time with VIBEMANCER_TELEMETRY=0 (DO_NOT_TRACK is honoured too).\n";
 function noticePath() {
-  return path7.join(os2.homedir(), ".vibemancer", "telemetry-notice-shown");
+  return path8.join(os2.homedir(), ".vibemancer", "telemetry-notice-shown");
 }
 function showNoticeOnce(marker = noticePath()) {
   try {
-    if (fs7.existsSync(marker)) return false;
-    fs7.mkdirSync(path7.dirname(marker), { recursive: true });
-    fs7.writeFileSync(marker, (/* @__PURE__ */ new Date()).toISOString());
+    if (fs8.existsSync(marker)) return false;
+    fs8.mkdirSync(path8.dirname(marker), { recursive: true });
+    fs8.writeFileSync(marker, (/* @__PURE__ */ new Date()).toISOString());
     console.log(TELEMETRY_NOTICE);
     return true;
   } catch {
@@ -1812,7 +1888,8 @@ Commands:
   logout       Sign out
   upload       Upload bot to VibeMancer for online competition
   pull         Download latest source code from VibeMancer
-               (--name <bot> restores it with no local file needed)
+               (--name <bot> restores it with no local file needed;
+                --force overwrites local changes it did not write)
   feedback     Submit a bug report or suggestion
   missile-calc Calculate missile cast time and DPS for a config
 
@@ -1920,10 +1997,10 @@ var KNOWN_FLAGS = {
   // pull was absent here for the same reason upload was, with the same consequence: a typo'd
   // flag was accepted and dropped, so `pull --nmae Wiz2` fell through to file discovery and
   // reported "could not find bot source file" about a flag the user had spelled wrong.
-  pull: ["--bot", "--name"],
+  pull: ["--bot", "--name", "--force"],
   "missile-calc": ["--damage", "--speed", "--duration", "--turnRate"]
 };
-var BOOLEAN_FLAGS = ["--mine", "--inactive", "--active", "--no-browser"];
+var BOOLEAN_FLAGS = ["--mine", "--inactive", "--active", "--no-browser", "--force"];
 function flagsMissingValues(command2, argv) {
   const known = KNOWN_FLAGS[command2];
   if (!known) return [];
@@ -2110,7 +2187,7 @@ ${list}
     case "pull": {
       const bot = parseFlag("--bot");
       const name = parseFlag("--name");
-      await runPull({ bot, name });
+      await runPull({ bot, name, force: args.includes("--force") });
       break;
     }
     case "login": {