@staff0rd/assist 0.518.0 → 0.519.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.518.0",
+  version: "0.519.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -10322,7 +10322,10 @@ async function fileContent(req, res) {
       respondJson(res, 413, { error: "File too large" });
       return;
     }
-    respondJson(res, 200, { content: await readFile(resolved.target, "utf8") });
+    respondJson(res, 200, {
+      content: await readFile(resolved.target, "utf8"),
+      mtimeMs: info.mtimeMs
+    });
   } catch {
     respondJson(res, 404, { error: "File not found" });
   }
@@ -12078,7 +12081,7 @@ async function uploadPrImage(req, res) {
 }
 
 // src/commands/sessions/web/writeFileContent.ts
-import { readFile as readFile2, writeFile as writeFile3 } from "fs/promises";
+import { readFile as readFile2, stat as stat3, writeFile as writeFile3 } from "fs/promises";
 
 // src/commands/sessions/web/formatWithOxfmt.ts
 import { execFile as execFile8 } from "child_process";
@@ -12108,26 +12111,50 @@ async function formatWithOxfmt(target, root) {
   });
 }
 
-// src/commands/sessions/web/writeFileContent.ts
-async function writeFileContent(req, res) {
-  const resolved = getFileTarget(req, res);
-  if (!resolved) return;
+// src/commands/sessions/web/getFileWriteBody.ts
+async function getFileWriteBody(req, res) {
   let body;
   try {
     body = await readJsonBody(req);
   } catch {
     respondJson(res, 400, { error: "Invalid JSON body" });
-    return;
+    return null;
   }
   if (typeof body.content !== "string") {
     respondJson(res, 400, { error: "Missing content" });
+    return null;
+  }
+  if (typeof body.mtimeMs !== "number") {
+    respondJson(res, 400, { error: "Missing mtimeMs" });
+    return null;
+  }
+  return { content: body.content, mtimeMs: body.mtimeMs };
+}
+
+// src/commands/sessions/web/writeFileContent.ts
+var STALE_MESSAGE = "The file changed on disk since it was opened";
+async function currentMtimeMs(target) {
+  try {
+    return (await stat3(target)).mtimeMs;
+  } catch {
+    return null;
+  }
+}
+async function writeFileContent(req, res) {
+  const resolved = getFileTarget(req, res);
+  if (!resolved) return;
+  const body = await getFileWriteBody(req, res);
+  if (!body) return;
+  if (await currentMtimeMs(resolved.target) !== body.mtimeMs) {
+    respondJson(res, 409, { error: STALE_MESSAGE });
     return;
   }
   try {
     await writeFile3(resolved.target, body.content, "utf8");
     await formatWithOxfmt(resolved.target, repoRoot(resolved.cwd));
     respondJson(res, 200, {
-      content: await readFile2(resolved.target, "utf8")
+      content: await readFile2(resolved.target, "utf8"),
+      mtimeMs: await currentMtimeMs(resolved.target)
     });
   } catch (error) {
     respondJson(res, 500, {
@@ -18499,10 +18526,10 @@ function findSlnFiles(dir, maxDepth, depth = 0) {
       continue;
     const full = path32.join(dir, entry);
     try {
-      const stat3 = statSync6(full);
-      if (stat3.isFile() && entry.endsWith(".sln")) {
+      const stat4 = statSync6(full);
+      if (stat4.isFile() && entry.endsWith(".sln")) {
         results.push(full);
-      } else if (stat3.isDirectory()) {
+      } else if (stat4.isDirectory()) {
         results.push(...findSlnFiles(full, maxDepth, depth + 1));
       }
     } catch {
@@ -34246,13 +34273,13 @@ import { readFileSync as readFileSync54, statSync as statSync14 } from "fs";
 import { isAbsolute as isAbsolute4, join as join78, resolve as resolve21 } from "path";
 function resolveGitDir(cwd) {
   const dotGit = join78(cwd, ".git");
-  let stat3;
+  let stat4;
   try {
-    stat3 = statSync14(dotGit);
+    stat4 = statSync14(dotGit);
   } catch {
     return null;
   }
-  if (stat3.isDirectory()) {
+  if (stat4.isDirectory()) {
     return dotGit;
   }
   let contents;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.518.0",
+	"version": "0.519.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {