claude-simple 0.2.25 → 0.2.27

package/src/collab.js

@@ -15,6 +15,12 @@ export function roleAtLeast(have, need) {
 export function createCollab({ filePath }) {
   let data = { users: [], locks: {}, routes: {} };
   let loaded = false;
+  let chain = Promise.resolve();
+  function withMutex(fn) {
+    const run = chain.then(fn, fn);
+    chain = run.then(() => undefined, () => undefined);
+    return run;
+  }
 
   async function load() {
     if (loaded) return data;
@@ -49,82 +55,95 @@ export function createCollab({ filePath }) {
   function token() { return crypto.randomBytes(16).toString('hex'); }
 
   async function acquire({ key, kind, holder, holderRole, lockToken, ttlMs, exclusive = true }) {
-    await load();
-    purgeLocks();
-    if (!roleAtLeast(holderRole, 'editor')) {
-      return { code: 403, error: 'viewers cannot take exclusive locks' };
-    }
-    if (!key) return { code: 400, error: 'key required' };
-    ttlMs = Math.min(Math.max(ttlMs || DEFAULT_TTL_MS, 5_000), 5 * 60_000);
-    const cur = data.locks[key];
-    if (!cur) {
-      const l = {
-        key, kind, holder, holderRole,
-        token: lockToken || token(),
-        exclusive, acquiredAt: now(), expiresAt: now() + ttlMs, version: 1,
-      };
-      data.locks[key] = l;
-      await save();
-      return { code: 200, lock: { ...l } };
-    }
-    if (cur.holder === holder && (!lockToken || lockToken === cur.token)) {
-      cur.expiresAt = now() + ttlMs;
-      if (!lockToken) {
-        cur.token = token();
-        cur.version += 1;
+    return withMutex(async () => {
+      await load();
+      purgeLocks();
+      if (!roleAtLeast(holderRole, 'editor')) {
+        return { code: 403, error: 'viewers cannot take exclusive locks' };
       }
-      await save();
-      return { code: 200, lock: { ...cur } };
-    }
-    const pub = { ...cur, token: undefined };
-    return { code: 423, error: 'locked', lock: pub };
+      if (!key) return { code: 400, error: 'key required' };
+      ttlMs = Math.min(Math.max(ttlMs || DEFAULT_TTL_MS, 5_000), 5 * 60_000);
+      const cur = data.locks[key];
+      if (!cur) {
+        const l = {
+          key, kind, holder, holderRole,
+          token: lockToken || token(),
+          exclusive, acquiredAt: now(), expiresAt: now() + ttlMs, version: 1,
+        };
+        data.locks[key] = l;
+        await save();
+        return { code: 200, lock: { ...l } };
+      }
+      // Same principal always reclaims. Never rotate the token on a token-less
+      // refresh: rotating locked the holder's other tabs out of their own session.
+      if (cur.holder === holder) {
+        cur.expiresAt = now() + ttlMs;
+        cur.holderRole = holderRole || cur.holderRole;
+        await save();
+        return { code: 200, lock: { ...cur } };
+      }
+      const pub = { ...cur, token: undefined };
+      return { code: 423, error: 'locked', lock: pub };
+    });
   }
 
   async function heartbeat({ key, holder, lockToken, ttlMs }) {
-    await load();
-    purgeLocks();
-    const cur = data.locks[key];
-    if (!cur) return { code: 404, error: 'no lock' };
-    if (cur.holder !== holder || cur.token !== lockToken) {
-      return { code: 409, error: 'token mismatch' };
-    }
-    cur.expiresAt = now() + (ttlMs || DEFAULT_TTL_MS);
-    await save();
-    return { code: 200, lock: { ...cur } };
+    return withMutex(async () => {
+      await load();
+      purgeLocks();
+      const cur = data.locks[key];
+      if (!cur) return { code: 404, error: 'no lock' };
+      if (cur.holder !== holder || cur.token !== lockToken) {
+        return { code: 409, error: 'token mismatch' };
+      }
+      cur.expiresAt = now() + (ttlMs || DEFAULT_TTL_MS);
+      await save();
+      return { code: 200, lock: { ...cur } };
+    });
   }
 
   async function release({ key, holder, lockToken, force }) {
-    await load();
-    const cur = data.locks[key];
-    if (!cur) return { code: 200 };
-    if (!force && (cur.holder !== holder || cur.token !== lockToken)) {
-      return { code: 409, error: 'token mismatch' };
-    }
-    delete data.locks[key];
-    await save();
-    return { code: 200 };
+    return withMutex(async () => {
+      await load();
+      const cur = data.locks[key];
+      if (!cur) return { code: 200 };
+      // Holder can drop their own lease without presenting the token (Flutter
+      // lock list has no stored token). Anyone else needs force-break.
+      if (!force && cur.holder !== holder) {
+        return { code: 409, error: 'token mismatch' };
+      }
+      delete data.locks[key];
+      await save();
+      return { code: 200 };
+    });
   }
 
   async function requireLock({ key, lockToken, writer, writerRole }) {
-    await load();
-    purgeLocks();
-    let cur = data.locks[key];
-    if (!cur) {
-      const l = {
-        key, kind: 'auto', holder: writer, holderRole: writerRole,
-        token: lockToken || token(), exclusive: true,
-        acquiredAt: now(), expiresAt: now() + AUTO_CLAIM_MS, version: 1,
-      };
-      data.locks[key] = l;
-      await save();
-      return { code: 200, lock: { ...l } };
-    }
-    if (cur.holder !== writer || (lockToken && lockToken !== cur.token)) {
+    return withMutex(async () => {
+      await load();
+      purgeLocks();
+      if (!roleAtLeast(writerRole, 'editor')) {
+        return { code: 403, error: 'forbidden' };
+      }
+      let cur = data.locks[key];
+      if (!cur) {
+        const l = {
+          key, kind: 'auto', holder: writer, holderRole: writerRole,
+          token: lockToken || token(), exclusive: true,
+          acquiredAt: now(), expiresAt: now() + AUTO_CLAIM_MS, version: 1,
+        };
+        data.locks[key] = l;
+        await save();
+        return { code: 200, lock: { ...l } };
+      }
+      // Same holder may omit or present a stale token; they already own the lease.
+      if (cur.holder === writer) {
+        cur.expiresAt = now() + DEFAULT_TTL_MS;
+        await save();
+        return { code: 200, lock: { ...cur } };
+      }
       return { code: 423, error: 'locked', lock: { ...cur, token: undefined } };
-    }
-    cur.expiresAt = now() + DEFAULT_TTL_MS;
-    await save();
-    return { code: 200, lock: { ...cur } };
+    });
   }
 
   async function listLocks() {

package/src/runtime/protocol.js

@@ -27,6 +27,9 @@ export function normalizeCommand(msg) {
       requestId: msg.requestId || null,
       allow: msg.allow,
       always: msg.always,
+      // An immediate replacement turn keeps any server-side follow-ups. This
+      // is opt-in; the legacy Stop action continues to discard them.
+      preserveQueue: msg.preserveQueue === true,
       cwd: msg.cwd || msg.options?.cwd || null,
     };
   }
@@ -42,6 +45,7 @@ export function normalizeCommand(msg) {
       requestId: null,
       allow: undefined,
       always: false,
+      preserveQueue: false,
       cwd: msg.options?.cwd || null,
     };
   }
@@ -57,6 +61,7 @@ export function normalizeCommand(msg) {
       requestId: null,
       allow: undefined,
       always: false,
+      preserveQueue: false,
       cwd: null,
     };
   }
@@ -72,6 +77,7 @@ export function normalizeCommand(msg) {
       requestId: msg.requestId || msg.request_id,
       allow: msg.allow !== false && msg.allow !== 0 && msg.allow !== '0',
       always: !!msg.always,
+      preserveQueue: false,
       cwd: null,
     };
   }
@@ -87,6 +93,7 @@ export function normalizeCommand(msg) {
       requestId: null,
       allow: undefined,
       always: false,
+      preserveQueue: false,
       cwd: msg.cwd || null,
     };
   }
@@ -102,6 +109,7 @@ export function normalizeCommand(msg) {
       requestId: null,
       allow: undefined,
       always: false,
+      preserveQueue: false,
       cwd: null,
     };
   }