circal-mcp 0.2.0 → 0.2.1

package/dist/circal-mcp.mjs

@@ -1460,8 +1460,9 @@ import { serveStdio } from "@modelcontextprotocol/server/stdio";
 
 // mcp/file.ts
 import { randomBytes } from "node:crypto";
-import { open, readFile, rename, rm } from "node:fs/promises";
+import { open, readFile, rename, rm, stat } from "node:fs/promises";
 import { dirname, join } from "node:path";
+import { setTimeout as sleep } from "node:timers/promises";
 
 // src/lib/time.ts
 var MINUTES_PER_DAY = 1440;
@@ -3664,25 +3665,68 @@ async function loadForRead(ctx2) {
   const contents = await readMirror(ctx2.path);
   return { contents, warning: zoneWarning(contents) };
 }
-async function casWriteOnce(ctx2, mutate) {
-  for (let attempt = 0; attempt < 2; attempt++) {
-    const before = await readMirror(ctx2.path);
-    assertVersionAllowsMutation(before);
-    assertZoneAllowsMutation(before, ctx2.env);
-    const { result, summary } = mutate(before);
-    const after = await readMirror(ctx2.path);
-    if (after.rev !== before.rev) {
-      if (attempt === 1) {
-        throw new Error(
-          `The file moved under this write: read at rev ${before.rev}, still found rev ${after.rev} after retrying once. Something else is writing it \u2014 try again.`
-        );
+var LOCK_STALE_MS = 1e4;
+var LOCK_WAIT_MS = 2e3;
+var LOCK_POLL_MS = 100;
+async function acquireLock(path2) {
+  const lock = `${path2}.lock`;
+  const deadline = Date.now() + LOCK_WAIT_MS;
+  for (; ; ) {
+    try {
+      const file = await open(lock, "wx");
+      try {
+        await file.writeFile(`${process.pid} ${(/* @__PURE__ */ new Date()).toISOString()}
+`, "utf8");
+      } finally {
+        await file.close();
       }
+      return lock;
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+    }
+    try {
+      if (Date.now() - (await stat(lock)).mtimeMs > LOCK_STALE_MS) {
+        await rm(lock, { force: true });
+        continue;
+      }
+    } catch {
       continue;
     }
-    await atomicWrite(ctx2.path, serialiseMirror(result, after.rev + 1, after.zone || localZone()));
-    return summary;
+    if (Date.now() >= deadline) {
+      throw new Error(
+        `Another writer holds ${lock}. If nothing else is writing this calendar, delete that file and retry.`
+      );
+    }
+    await sleep(LOCK_POLL_MS);
+  }
+}
+async function casWriteOnce(ctx2, mutate) {
+  const lock = await acquireLock(ctx2.path);
+  try {
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const before = await readMirror(ctx2.path);
+      assertVersionAllowsMutation(before);
+      assertZoneAllowsMutation(before, ctx2.env);
+      const { result, summary } = mutate(before);
+      const after = await readMirror(ctx2.path);
+      if (after.rev !== before.rev) {
+        if (attempt === 1) {
+          throw new Error(
+            `The file moved under this write: read at rev ${before.rev}, still found rev ${after.rev} after retrying once. Something else is writing it \u2014 try again.`
+          );
+        }
+        continue;
+      }
+      await atomicWrite(
+        ctx2.path,
+        serialiseMirror(result, after.rev + 1, after.zone || localZone())
+      );
+      return summary;
+    }
+    throw new Error("unreachable");
+  } finally {
+    await rm(lock, { force: true });
   }
-  throw new Error("unreachable");
 }
 var writeQueue = Promise.resolve();
 function casWrite(ctx2, mutate) {
@@ -3695,7 +3739,7 @@ function casWrite(ctx2, mutate) {
 }
 
 // mcp/find.ts
-import { readFile as readFile2, readdir, stat } from "node:fs/promises";
+import { readFile as readFile2, readdir, stat as stat2 } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join as join2 } from "node:path";
 var SKIP_DIR_NAMES = { node_modules: true, Library: true, ".git": true };
@@ -3742,7 +3786,7 @@ async function listDir(path2) {
 }
 async function asMirror(path2) {
   try {
-    const info = await stat(path2);
+    const info = await stat2(path2);
     if (!info.isFile() || info.size > MAX_FILE_BYTES) return null;
     const text = await readFile2(path2, "utf8");
     const contents = readMirrorFile(text);
@@ -3930,7 +3974,8 @@ function resolveSpanForCreate(input, day, defaultDuration) {
     const at = atMinutes(day, parseTime(input.start, "start")).getTime();
     return { start: at, end: at, allDay: false, task: true };
   }
-  const noTimeGiven = input.start === void 0 && input.end === void 0 && input.duration === void 0;
+  const endIsDay = input.end !== void 0 && DATE_KEY_RE.test(input.end);
+  const noTimeGiven = input.start === void 0 && (input.end === void 0 || endIsDay) && input.duration === void 0;
   const allDay = input.allDay === true || input.allDay === void 0 && noTimeGiven;
   if (allDay) {
     const days = input.end ? Math.max(1, daysBetween(day, fromDayKey(input.end)) + 1) : 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "circal-mcp",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "MCP server for circal — read and write your calendar through its mirror file",
   "license": "MIT",