@google/gemini-cli-core 0.63.0-preview.0 → 0.64.0-nightly.20261001.gc6bccb7ec

package/dist/src/utils/pathMutex.js

@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * In-process, per-path mutex used to serialize read-modify-write sequences
+ * against the same file.
+ *
+ * Parallel tool execution (notably sub-agents) can schedule two writes to the
+ * same path concurrently. Without serialization the two sequences interleave
+ * and one update is silently lost.
+ *
+ * Scope: this coordinates callers inside a single process only. It does not
+ * guard against a second Gemini CLI process, an editor, or any other program
+ * writing the same file; that would require an on-disk lock.
+ *
+ * Callers are expected to pass an already-resolved absolute path so that two
+ * spellings of the same file map to the same lock.
+ */
+const chains = new Map();
+/**
+ * Runs `fn` with exclusive access to `key`, relative to other `withPathLock`
+ * callers using the same key.
+ *
+ * @param key - The resolved path (or other identifier) to lock.
+ * @param fn - The critical section.
+ * @param signal - Optional abort signal for immediate cancellation while waiting.
+ * @returns Whatever `fn` resolves to.
+ */
+export async function withPathLock(key, fn, signal) {
+    if (signal?.aborted) {
+        throw new Error('Aborted');
+    }
+    const previous = chains.get(key) ?? Promise.resolve();
+    let resolveLockReleased = () => { };
+    const lockReleased = new Promise((resolve) => {
+        resolveLockReleased = resolve;
+    });
+    chains.set(key, lockReleased);
+    const cleanup = () => {
+        if (chains.get(key) === lockReleased) {
+            chains.delete(key);
+        }
+    };
+    return new Promise((resolve, reject) => {
+        let active = true;
+        const onAbort = () => {
+            if (!active)
+                return;
+            active = false;
+            if (signal) {
+                signal.removeEventListener('abort', onAbort);
+            }
+            // When the lock holder before us finishes, release our lock for subsequent waiters.
+            void previous.then(() => {
+                resolveLockReleased();
+                cleanup();
+            });
+            reject(new Error('Aborted'));
+        };
+        if (signal) {
+            signal.addEventListener('abort', onAbort);
+        }
+        void previous.then(async () => {
+            if (!active) {
+                return;
+            }
+            if (signal) {
+                signal.removeEventListener('abort', onAbort);
+            }
+            if (signal?.aborted) {
+                onAbort();
+                return;
+            }
+            try {
+                const result = await fn();
+                resolve(result);
+            }
+            catch (err) {
+                reject(err);
+            }
+            finally {
+                if (active) {
+                    active = false;
+                    resolveLockReleased();
+                    cleanup();
+                }
+            }
+        });
+    });
+}
+/**
+ * Number of paths currently holding lock state. Exposed for tests.
+ */
+export function pendingPathLockCount() {
+    return chains.size;
+}
+//# sourceMappingURL=pathMutex.js.map

package/dist/src/utils/pathMutex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pathMutex.js","sourceRoot":"","sources":["../../../src/utils/pathMutex.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAW,EACX,EAAoB,EACpB,MAAoB;IAEpB,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAEtD,IAAI,mBAAmB,GAAe,GAAG,EAAE,GAAE,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACjD,mBAAmB,GAAG,OAAO,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE9B,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,YAAY,EAAE,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC,MAAM;gBAAE,OAAO;YACpB,MAAM,GAAG,KAAK,CAAC;YACf,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;YACD,oFAAoF;YACpF,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;gBACtB,mBAAmB,EAAE,CAAC;gBACtB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;YACD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;gBAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;oBAAS,CAAC;gBACT,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,GAAG,KAAK,CAAC;oBACf,mBAAmB,EAAE,CAAC;oBACtB,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC"}

package/dist/src/utils/pathMutex.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/pathMutex.test.js

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { pendingPathLockCount, withPathLock } from './pathMutex.js';
+describe('withPathLock', () => {
+    it('serializes callbacks that target the same key', async () => {
+        const events = [];
+        const first = withPathLock('/tmp/same.txt', async () => {
+            events.push('first:enter');
+            await new Promise((resolve) => setTimeout(resolve, 10));
+            events.push('first:exit');
+        });
+        const second = withPathLock('/tmp/same.txt', async () => {
+            events.push('second:enter');
+            await new Promise((resolve) => setTimeout(resolve, 0));
+            events.push('second:exit');
+        });
+        await Promise.all([first, second]);
+        expect(events).toEqual([
+            'first:enter',
+            'first:exit',
+            'second:enter',
+            'second:exit',
+        ]);
+    });
+    it('runs callbacks for different keys concurrently', async () => {
+        const events = [];
+        const first = withPathLock('/tmp/a.txt', async () => {
+            events.push('a:enter');
+            await new Promise((resolve) => setTimeout(resolve, 10));
+            events.push('a:exit');
+        });
+        const second = withPathLock('/tmp/b.txt', async () => {
+            events.push('b:enter');
+            await new Promise((resolve) => setTimeout(resolve, 0));
+            events.push('b:exit');
+        });
+        await Promise.all([first, second]);
+        // b finishes before a because they do not share a lock.
+        expect(events).toEqual(['a:enter', 'b:enter', 'b:exit', 'a:exit']);
+    });
+    it('does not stall waiting callers if an earlier caller throws', async () => {
+        const events = [];
+        const failing = withPathLock('/tmp/throwing.txt', async () => {
+            events.push('failing:run');
+            throw new Error('boom');
+        });
+        const succeeding = withPathLock('/tmp/throwing.txt', async () => {
+            events.push('succeeding:run');
+            return 'ok';
+        });
+        await expect(failing).rejects.toThrow('boom');
+        await expect(succeeding).resolves.toBe('ok');
+        expect(events).toEqual(['failing:run', 'succeeding:run']);
+    });
+    it('cleans up lock state after the last waiter resolves', async () => {
+        const key = '/tmp/cleanup.txt';
+        const p1 = withPathLock(key, async () => {
+            await new Promise((resolve) => setTimeout(resolve, 5));
+        });
+        const p2 = withPathLock(key, async () => {
+            await new Promise((resolve) => setTimeout(resolve, 5));
+        });
+        expect(pendingPathLockCount()).toBeGreaterThan(0);
+        await Promise.all([p1, p2]);
+        expect(pendingPathLockCount()).toBe(0);
+    });
+    it('aborts immediately while queued behind an active lock holder', async () => {
+        const key = '/tmp/abort_immediate.txt';
+        const events = [];
+        const p1 = withPathLock(key, async () => {
+            events.push('p1:start');
+            await new Promise((resolve) => setTimeout(resolve, 50));
+            events.push('p1:end');
+        });
+        const controller = new AbortController();
+        const p2 = withPathLock(key, async () => {
+            events.push('p2:run');
+        }, controller.signal);
+        setTimeout(() => controller.abort(), 10);
+        const p3 = withPathLock(key, async () => {
+            events.push('p3:run');
+        });
+        await expect(p2).rejects.toThrow('Aborted');
+        expect(events).toEqual(['p1:start']);
+        await p1;
+        await p3;
+        expect(events).toEqual(['p1:start', 'p1:end', 'p3:run']);
+        expect(pendingPathLockCount()).toBe(0);
+    });
+});
+//# sourceMappingURL=pathMutex.test.js.map

package/dist/src/utils/pathMutex.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pathMutex.test.js","sourceRoot":"","sources":["../../../src/utils/pathMutex.test.ts"],"names":[],"mappings":"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"}