pi-edit-fence 1.0.0 → 1.0.2

package/README.md

@@ -64,7 +64,7 @@ Edit the tunables at the top of `extensions/edit-fence.ts`:
 | `SCOPE`              | `"file"`           | `"file"` locks the exact file. `"dir"` locks a subtree for area-level coordination. |
 | `CLAIM_DEPTH`        | `2`                | Subtree depth when `SCOPE === "dir"` (2 keeps `src/api` and `src/ui` distinct).     |
 | `LEASE_MS`           | `5 min`            | Idle time before a lock auto-expires.                                               |
-| `CONTENDED_LEASE_MS` | `20 s`             | Shorter idle lease applied while another session is waiting.                        |
+| `CONTENDED_LEASE_MS` | `10 s`             | Shorter idle lease applied while another session is waiting.                        |
 | `WAIT_MS`            | `15 s`             | How long a blocked edit waits before returning the retry-later message.             |
 | `SHARED_PATTERNS`    | configs, lockfiles | Glob patterns treated as warn-only shared zones.                                    |
 

package/extensions/edit-fence.ts

@@ -63,7 +63,7 @@ const LEASE_MS = 5 * 60 * 1000;
 // When another session is actively waiting on a subtree, the owner's idle lease
 // shortens to this. A genuinely-done owner frees fast, but only under contention;
 // a solo owner keeps the full LEASE_MS.
-const CONTENDED_LEASE_MS = 20 * 1000;
+const CONTENDED_LEASE_MS = 10 * 1000;
 // On a blocked edit, wait this long for the owner to release/expire before giving
 // the agent a retry-later message (transparently absorbs brief overlaps).
 const WAIT_MS = 15 * 1000;
@@ -269,13 +269,15 @@ export default function (pi: ExtensionAPI) {
 			return undefined;
 		}
 		if (result.kind === "block") {
+			// How long until the lock auto-expires if the owner stays idle from now.
+			// Contention shortens the lease, so this is the worst-case wait before retry succeeds.
+			const lease = result.owner.contendedAt != null ? CONTENDED_LEASE_MS : LEASE_MS;
+			const remainingSec = Math.max(0, Math.ceil((result.owner.ts + lease - Date.now()) / 1000));
 			return {
 				block: true,
 				reason:
-					`path-fence: ${SCOPE === "file" ? "file" : "area"} "${key}" is currently locked by another active pi session (${result.owner.session}, pid ${result.owner.pid}). ` +
-					`This lock is TEMPORARY and releases automatically when that session moves on. ` +
-					`Do not loop-retry now. Instead: ${SCOPE === "file" ? "work on OTHER files" : `work on files OUTSIDE "${key}"`} first, then RETRY this edit LATER — it will succeed once the other session is done. ` +
-					`If you have no other work, tell the user "${key}" is held by another session (they can run "/steal ${key}" to force handover; you cannot run that yourself).`,
+					`path-fence: ${SCOPE === "file" ? "file" : "area"} "${key}" is locked by another active pi session (${result.owner.session}, pid ${result.owner.pid}). ` +
+					`Work on other files, or wait and retry this edit. The lock releases when the other session is done, and auto-expires in ~${remainingSec}s if it goes idle now (each edit it makes resets that timer).`,
 			};
 		}
 		if (result.kind === "warn" && ctx.hasUI) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-edit-fence",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Stop concurrent pi sessions from clobbering each other's edits. Per-file locks, auto-claim on edit, retry-later, lease expiry, crash recovery. No git worktrees.",
   "keywords": [
     "pi-package",