weir-harness 1.2.2 → 2.0.0

package/cordis.patch.yml

@@ -40,12 +40,6 @@
         worktreeAutoSetup: true
         worktreeWatchTimeoutMinutes: 360
         worktreeAutoApprove: auto-clean
-        editLockEnabled: true
-        # Message-driven auto-resume (edit-lock-auto-resume-on-message): a genuine
-        # user message resumes a stopped session and confirms its retained files.
-        # Read live per message, so toggling applies without a restart.
-        editLockAutoResume: true
-        editLockStaleSweep: true
         robashEnabled: true
         # The five whitelist tables are NOT declared here on purpose. A patch
         # row's `config` is replaced WHOLE rather than deep-merged, so a default
@@ -185,10 +179,6 @@
               compaction: true
               toolResultPruner: true
               weirCompactionCoordinator: true
-              # 编辑锁服务：提供者 edit-lock 与消费者 todo-driver / hashline-edit /
-              # lsp 同在本组。预设服务必须 isolate，否则预设加载以
-              # "Preset services require isolate realms" 失败。
-              weirEditLock: true
               # Worktree lanes service: provider (worktree) and consumer
               # (delegate) share this realm (S24 / S26 S-A).
               weirWorktreeLanes: true
@@ -241,10 +231,10 @@
               # F4 todo 续推：空转续推 + 用户打断/供应商错误语义 + 逃生舱
               - id: todo-driver
                 name: 'weir-harness/todo-driver'
-              # 编辑锁（默认开）：显式保存 false 后重启才关闭；须在 hashline-edit / lsp 前挂载。
-              # 两个消费者挂载时捕获隔离组内的锁服务。
-              - id: edit-lock
-                name: 'weir-harness/edit-lock'
+              # 文件租约（编辑锁新实现）：进程内共享一个租约 client，发布五个所有权
+              # 工具；不发布 cordis 服务，因此不需要 isolate 组，也不再约束行序。
+              - id: file-lease
+                name: 'weir-harness/file-lease'
               # F7 锚点编辑：read 锚点增强 + fail-closed hash_edit 工具
               - id: hashline-edit
                 name: 'weir-harness/hashline-edit'
@@ -378,7 +368,6 @@
               compaction: true
               toolResultPruner: true
               weirCompactionCoordinator: true
-              weirEditLock: true
               weirWorktreeLanes: true
               weirBlackboard: true
             config:
@@ -418,9 +407,9 @@
                 name: 'weir-harness/blackboard'
               - id: todo-driver
                 name: 'weir-harness/todo-driver'
-              # Must precede hashline-edit / lsp (mount-time capture).
-              - id: edit-lock
-                name: 'weir-harness/edit-lock'
+              # File leases (the edit-lock rebuild): no service, no ordering constraint.
+              - id: file-lease
+                name: 'weir-harness/file-lease'
               - id: hashline-edit
                 name: 'weir-harness/hashline-edit'
                 config:

package/lib/client.file-lease-badge.js

@@ -0,0 +1,307 @@
+window.__ModuleLoader__.load({
+	id: "weir-harness",
+	chunk: "client.file-lease-badge.js",
+	factory: (require) => {
+		var module = { exports: {} };
+		var exports = module.exports;
+		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		let react = require("react");
+		let react_jsx_runtime = require("react/jsx-runtime");
+		// ---- Edit-lock Badge (conversation composer bar) ----
+		// The ONLY user-visible surface of the edit-lock mechanism (design D13).
+		// It is read-only by construction, not by convention:
+		//
+		//   - the badge has exactly three states — idle, holding N, unprotected
+		//     — and each one resolves by itself (turn end, expiry, negotiation).
+		//     None of them asks the user for anything. The badge names the
+		//     surface, and appends a fact only when there is one: how many files
+		//     this session holds, or that protection is off. An idle badge is
+		//     just its name — never a status word standing in for "nothing";
+		//   - the panel speaks only when there is something to say. With no
+		//     claim and no degraded protection it is ONE line; each group's
+		//     heading appears only above a non-empty list, and the protection
+		//     notice only when protection is degraded. There are no headings over
+		//     empty lists and no disclaimer about what cannot be clicked: a
+		//     surface with no controls needs no sentence saying so;
+		//   - it contains NO button besides its own toggle, NO command input, NO
+		//     confirmation step and no clickable row. Expand/collapse is the one
+		//     interaction in this chunk; every ownership change belongs to the
+		//     model's tools. A control here would reintroduce the "some state
+		//     needs a human" that the rebuild exists to delete;
+		//   - it never writes to the conversation and never notifies. The read
+		//     goes to the one read-only endpoint through the composition root's
+		//     `fetchView` prop; nothing else is called.
+		//
+		// Everything shown arrives pre-shaped by the server-side view
+		// (`src/file-lease/view.js`): short path names, holder labels, and how
+		// long a retention has left. This chunk renders that and derives only
+		// the presentation state — it never parses prose and never invents a
+		// fact.
+		const STATE_NONE = "none";
+		const STATE_HOLDING = "holding";
+		const STATE_DEGRADED = "degraded";
+		/** Status-dot colour per state; only theme-defined tokens. */
+		const dotColor = {
+			none: "var(--dsw-alias-label-tertiary)",
+			holding: "var(--dsw-alias-state-business-primary)",
+			degraded: "var(--dsw-alias-state-warn-primary)"
+		};
+		const rootStyle = { position: "relative", display: "inline-flex" };
+		const badgeStyle = {
+			display: "inline-flex",
+			alignItems: "center",
+			gap: "6px",
+			background: "none",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			borderRadius: "var(--dsw-radius-sm)",
+			cursor: "pointer",
+			padding: "3px 8px",
+			fontSize: "12px",
+			lineHeight: "16px",
+			color: "var(--dsw-alias-label-secondary)"
+		};
+		// Popover surface: the theme's documented overlay token (light and dark).
+		const panelStyle = {
+			position: "absolute",
+			bottom: "calc(100% + 6px)",
+			right: 0,
+			zIndex: 20,
+			width: "min(420px, 80vw)",
+			maxHeight: "50vh",
+			overflow: "auto",
+			background: "var(--dsw-alias-bg-overlay)",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			borderRadius: "var(--dsw-radius-md, 8px)",
+			boxShadow: "0 6px 24px var(--dsw-alias-border-l2)",
+			padding: "10px 12px",
+			color: "var(--dsw-alias-label-primary)",
+			fontSize: "12px",
+			lineHeight: "18px"
+		};
+		const mutedStyle = { color: "var(--dsw-alias-label-secondary)" };
+		/** A group heading: bold, and spaced only when something precedes it. */
+		const headStyle = { fontWeight: 600 };
+		// The degraded notice: amber (the same token the dot uses) at the panel's
+		// own weight — a status line, not an alarm.
+		const noticeStyle = { color: "var(--dsw-alias-state-warn-primary)" };
+		const rowStyle = { display: "flex", flexWrap: "wrap", alignItems: "baseline", gap: "8px", padding: "3px 0", borderTop: "1px solid var(--dsw-alias-border-l2)" };
+		const nameStyle = { flex: 1, minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", fontFamily: "var(--dsw-font-markdown-code-block-font-family, ui-monospace, monospace)" };
+		const dot = (state) => react_jsx_runtime.jsx("span", { "aria-hidden": true, style: { display: "inline-block", width: "7px", height: "7px", borderRadius: "50%", background: dotColor[state], flex: "none" } });
+		/**
+		 * The badge state of a view. Anything unreadable is `degraded`: an
+		 * unreadable surface must never be presented as "nothing held", which
+		 * reads like a fact the panel cannot actually vouch for.
+		 * @param {any} view the server-shaped view
+		 * @returns {"none" | "holding" | "degraded"}
+		 */
+		function stateOf(view) {
+			if (!view || typeof view !== "object") return STATE_DEGRADED;
+			if (view.arbiter !== "ok") return STATE_DEGRADED;
+			const mine = Array.isArray(view.mine) ? view.mine : [];
+			return mine.length > 0 ? STATE_HOLDING : STATE_NONE;
+		}
+		/** The claims of one section, tolerating a partial/degraded payload. */
+		function rowsOf(view, key) {
+			const rows = view && Array.isArray(view[key]) ? view[key] : [];
+			return rows.filter((row) => row && typeof row === "object" && typeof row.path === "string" && row.path !== "");
+		}
+		/** Remaining retention in whole minutes, or null when there is none. */
+		function retainedMinutes(holdUntil, at) {
+			if (typeof holdUntil !== "number" || !Number.isFinite(holdUntil)) return null;
+			const minutes = Math.max(0, Math.ceil((holdUntil - at) / 60000));
+			return minutes > 0 ? minutes : null;
+		}
+		function FileLeaseBadge(props) {
+			const t = props.t;
+			const sessionId = props.sessionId;
+			const [open, setOpen] = react.useState(false);
+			// `any`: the payload is the server-shaped view, narrowed on read.
+			const [view, setView] = react.useState(/** @type {any} */ (null));
+			// The one read: on mount so the badge is right before it is ever
+			// expanded, and again each time the panel opens (a snapshot, never a
+			// poll — ownership has no state to keep in sync).
+			const read = () => {
+				if (typeof props.fetchView !== "function") {
+					setView({ schemaVersion: 1, arbiter: "unavailable", mine: [], others: [] });
+					return Promise.resolve();
+				}
+				return Promise.resolve(props.fetchView()).then(
+					(next) => { if (next && typeof next === "object") setView(next); },
+					// A failed read is the degraded state: the panel cannot vouch
+					// for anything, so it says so instead of showing an empty list.
+					() => { setView({ schemaVersion: 1, arbiter: "unavailable", mine: [], others: [] }); }
+				);
+			};
+			react.useEffect(() => {
+				if (!sessionId) {
+					setView(null);
+					setOpen(false);
+					return undefined;
+				}
+				read();
+				return undefined;
+			}, [sessionId]);
+			// Close on Escape and on any pointerdown outside this entry's wrapper:
+			// the same dismissal the other composer surfaces use, and the only way
+			// out of the panel that needs no action model behind it.
+			react.useEffect(() => {
+				if (!open || typeof document === "undefined") return undefined;
+				const onPointerDown = (event) => {
+					if (event && typeof event.target?.closest === "function" && event.target.closest("[data-weir-file-lease-root]")) return;
+					setOpen(false);
+				};
+				const onKeyDown = (event) => {
+					if (event?.key === "Escape") setOpen(false);
+				};
+				document.addEventListener("pointerdown", onPointerDown);
+				document.addEventListener("keydown", onKeyDown);
+				return () => {
+					document.removeEventListener("pointerdown", onPointerDown);
+					document.removeEventListener("keydown", onKeyDown);
+				};
+			}, [open]);
+			if (!sessionId) return null;
+			// Before the first read settles the entry shows the idle state:
+			// ownership does not survive the process (D10), so "nothing held" is
+			// the honest answer for a session that has not been read yet.
+			const state = view === null ? STATE_NONE : stateOf(view);
+			const mine = rowsOf(view, "mine");
+			const others = rowsOf(view, "others");
+			// The badge suffix: a fact when there is one, nothing when there is
+			// not. An idle badge never says "not holding" — it simply is idle.
+			const suffix = state === STATE_HOLDING
+				? t("fileLeaseState_holding").replace("{n}", String(mine.length))
+				: state === STATE_DEGRADED ? t("fileLeaseState_degraded") : "";
+			const arbiter = view && typeof view.arbiter === "string" ? view.arbiter : "unavailable";
+			const at = Date.now();
+			const toggle = () => {
+				const next = !open;
+				setOpen(next);
+				if (next) read();
+			};
+			const row = (entry, key, trailing) => react_jsx_runtime.jsxs("div", {
+				style: rowStyle,
+				"data-weir-file-lease-row": key,
+				children: [
+					react_jsx_runtime.jsx("span", { style: nameStyle, title: entry.path, children: entry.path }),
+					...trailing
+				]
+			}, `${key}:${entry.path}`);
+			const mineRows = mine.map((entry) => {
+				const trailing = [];
+				const minutes = retainedMinutes(entry.holdUntil, at);
+				if (minutes !== null) {
+					trailing.push(react_jsx_runtime.jsx("span", { style: mutedStyle, "data-weir-file-lease-retained": entry.path, children: t("fileLeaseRetainedFor").replace("{n}", String(minutes)) }, "retained"));
+				}
+				return row(entry, "mine", trailing);
+			});
+			const otherRows = others.map((entry) => {
+				const label = entry.holder && typeof entry.holder.label === "string" ? entry.holder.label : "";
+				return row(entry, "others", [react_jsx_runtime.jsx("span", { style: mutedStyle, "data-weir-file-lease-holder": entry.path, children: label }, "holder")]);
+			});
+			// The panel is assembled as blocks so that spacing, and the existence
+			// of a heading, both follow from what is actually there.
+			const blocks = [];
+			if (state === STATE_DEGRADED) {
+				blocks.push(react_jsx_runtime.jsx("div", {
+					style: noticeStyle,
+					"data-weir-file-lease-arbiter": arbiter,
+					children: t("fileLeaseDegradedHint")
+				}, "notice"));
+			}
+			const head = (key, text) => react_jsx_runtime.jsx("div", {
+				style: blocks.length === 0 ? headStyle : { ...headStyle, marginTop: "10px" },
+				children: text
+			}, `${key}-head`);
+			if (mineRows.length > 0) {
+				blocks.push(head("mine", t("fileLeaseMine")));
+				blocks.push(react_jsx_runtime.jsx("div", { "data-weir-file-lease-section": "mine", children: mineRows }, "mine"));
+			}
+			if (otherRows.length > 0) {
+				blocks.push(head("others", t("fileLeaseOthers")));
+				blocks.push(react_jsx_runtime.jsx("div", { "data-weir-file-lease-section": "others", children: otherRows }, "others"));
+			}
+			// Nothing held anywhere: one plain line, and (when protection is
+			// degraded) one notice above it — never a section skeleton.
+			if (mineRows.length === 0 && otherRows.length === 0) {
+				blocks.push(react_jsx_runtime.jsx("div", {
+					style: blocks.length === 0 ? mutedStyle : { ...mutedStyle, marginTop: "6px" },
+					"data-weir-file-lease-empty": "",
+					children: t("fileLeaseEmpty")
+				}, "empty"));
+			}
+			return react_jsx_runtime.jsxs("span", {
+				style: rootStyle,
+				"data-weir-file-lease-root": "",
+				children: [
+					react_jsx_runtime.jsxs("button", {
+						type: "button",
+						style: badgeStyle,
+						onClick: toggle,
+						"aria-expanded": open,
+						"data-weir-file-lease": "",
+						"data-weir-file-lease-state": state,
+						title: t("fileLeaseTitle"),
+						children: [
+							dot(state),
+							react_jsx_runtime.jsx("span", { children: t("fileLeaseLabel") }),
+							suffix === "" ? null : react_jsx_runtime.jsx("span", { "data-weir-file-lease-summary": "", children: suffix })
+						]
+					}),
+					open ? react_jsx_runtime.jsx("div", {
+						role: "dialog",
+						"aria-label": t("fileLeasePanelTitle"),
+						style: panelStyle,
+						"data-weir-file-lease-panel": "",
+						onKeyDown: (event) => { if (event?.key === "Escape") setOpen(false); },
+						children: blocks
+					}) : null
+				]
+			});
+		}
+		// Locale data face (pure data, NO ctx calls — a chunk factory re-executes
+		// under HMR, so a chunk-local register would throw on the duplicate
+		// (namespace, locale) pair): the entry registers these under
+		// "settings.weir.file-lease" inside a ctx.effect when this chunk arrives
+		// (lib/client.js registerChunkDictionaries). Pinned by test/client.test.js's
+		// dictionary union pin.
+		//
+		// Copy rules: plain user-facing words only — no internal vocabulary, no
+		// "read-only" disclaimers, no status word for the idle state. Badge
+		// suffixes carry their own leading separator so the badge reads as one
+		// string in both locales.
+		const dictionaries = {
+			en: {
+				fileLeaseLabel: "Edit Lock",
+				fileLeaseTitle: "Files in use",
+				fileLeasePanelTitle: "Files in use",
+				fileLeaseState_holding: " · {n}",
+				fileLeaseState_degraded: " · unprotected",
+				fileLeaseMine: "You are editing",
+				fileLeaseOthers: "Another session is editing",
+				fileLeaseEmpty: "No files in use.",
+				fileLeaseDegradedHint: "Protection is temporarily unavailable; editing continues.",
+				fileLeaseRetainedFor: "{n} min left"
+			},
+			zh: {
+				fileLeaseLabel: "编辑锁",
+				fileLeaseTitle: "文件占用",
+				fileLeasePanelTitle: "文件占用",
+				fileLeaseState_holding: " · {n}",
+				fileLeaseState_degraded: " · 未加锁",
+				fileLeaseMine: "你正在编辑",
+				fileLeaseOthers: "其他会话正在编辑",
+				fileLeaseEmpty: "暂无文件占用。",
+				fileLeaseDegradedHint: "保护暂不可用，编辑不受影响。",
+				fileLeaseRetainedFor: "保留 {n} 分钟"
+			}
+		};
+
+		exports.dictionaries = dictionaries;
+		exports.FileLeaseBadge = FileLeaseBadge;
+		exports.stateOf = stateOf;
+		exports.rowsOf = rowsOf;
+		exports.retainedMinutes = retainedMinutes;
+		return module.exports;
+	}
+});

package/lib/client.js

@@ -1,4 +1,4 @@
-// Weir client chunks: {"client.blackboard-model.js":"2e5abdd44edb599d10d9d547fa07133e84250d6007161c2c8704b58151896f93","client.blackboard-panel.js":"c9d6a0f02623075fc884f3519f982574ad33ad871f7bcd7e8c36f12512f0de39","client.capability-badge.js":"6ffd703f498e0aa5cc8ac78f244402ec4ceee56d22d2a0e74c246799565776cc","client.capability-manager.js":"d22e8116922f98e61bbbdf36fc78bd81e8b47b0ee5e75ddb06bea4e204749b89","client.capability-model.js":"d2aef1aa2daaecad6c9a1b9d9a0ecf6fb37dd7ec80efff5d532cf3b8a6efa712","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"2e885922cf8c2972725c6eef8bf20c7d1202d961edfb8ad41574dac062d74371","client.disabled-categories-editor.js":"f9103fd2e2691eda9afd199e1a5462189097a9f3dee0518be5fa3587d896e033","client.edit-lock-maintenance.js":"5e6933f3ad222ea99e890a06b94a223de1e864de058fca2a53954d62eaad9ab8","client.edit-lock-panel.js":"fa78a0762d2787e6322308dfff103aab3cdbd078d1ec22000d6deefe258153b1","client.hash-edit-model.js":"71727d47a6ef32ebd2abfb063fa93499a5e607d6716e3ec8983ae056c4fb317f","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"30943ed1ed11c1f2770a724da855ea2417c11566c2778c79e17cfc2de499cd80","client.lsp-panel.js":"61629a4d317dae9ed01c1cc0355632fb752788dc23f7606257188050734cd030","client.lsp-toggle.js":"d6af81be5e5b854e98563bbb9349a6db89834a9d7dee9cf0e97759ecb32090e8","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"2be9bdbeffef96baa3cbe4ce430ab30a1d1bf797782453d287d54602ea47db8e","client.notify-web.js":"0943f67d5526ff0fb7cb4f69580e0a9ea54ed06465c513afc51a5a7fb1c55ccf","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"f4395338a773e8bb48e4f96aeb737cd634edcca0b90af992a7dbbe47be42e451","client.settings-page.js":"b6524f04641793602e00bc42f1c86f7e8981b903e16a8493379126c359dbab96","client.worktree-model.js":"8bfbaaa080f20e90a0128afccb9b4e232514615a8f2fee3a32a42dde78b34a8f","client.worktree-view.js":"356c3f5f683b8509ae8679243a6460ca02957fd15e057a629b2ac4fdd12ed057"}
+// Weir client chunks: {"client.blackboard-model.js":"2e5abdd44edb599d10d9d547fa07133e84250d6007161c2c8704b58151896f93","client.blackboard-panel.js":"c9d6a0f02623075fc884f3519f982574ad33ad871f7bcd7e8c36f12512f0de39","client.capability-badge.js":"6ffd703f498e0aa5cc8ac78f244402ec4ceee56d22d2a0e74c246799565776cc","client.capability-manager.js":"d22e8116922f98e61bbbdf36fc78bd81e8b47b0ee5e75ddb06bea4e204749b89","client.capability-model.js":"d2aef1aa2daaecad6c9a1b9d9a0ecf6fb37dd7ec80efff5d532cf3b8a6efa712","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"2e885922cf8c2972725c6eef8bf20c7d1202d961edfb8ad41574dac062d74371","client.disabled-categories-editor.js":"f9103fd2e2691eda9afd199e1a5462189097a9f3dee0518be5fa3587d896e033","client.file-lease-badge.js":"cd30546307c91c94fe05484557e46f58c53fe55657f62b0a0415a072dfb3b582","client.hash-edit-model.js":"71727d47a6ef32ebd2abfb063fa93499a5e607d6716e3ec8983ae056c4fb317f","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"30943ed1ed11c1f2770a724da855ea2417c11566c2778c79e17cfc2de499cd80","client.lsp-panel.js":"61629a4d317dae9ed01c1cc0355632fb752788dc23f7606257188050734cd030","client.lsp-toggle.js":"d6af81be5e5b854e98563bbb9349a6db89834a9d7dee9cf0e97759ecb32090e8","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"2be9bdbeffef96baa3cbe4ce430ab30a1d1bf797782453d287d54602ea47db8e","client.notify-web.js":"0943f67d5526ff0fb7cb4f69580e0a9ea54ed06465c513afc51a5a7fb1c55ccf","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"f4395338a773e8bb48e4f96aeb737cd634edcca0b90af992a7dbbe47be42e451","client.settings-page.js":"f3c04a5b33cdb963357bc653f7050e598f19efc4cc833694379a4ba055e949d3","client.worktree-model.js":"8bfbaaa080f20e90a0128afccb9b4e232514615a8f2fee3a32a42dde78b34a8f","client.worktree-view.js":"356c3f5f683b8509ae8679243a6460ca02957fd15e057a629b2ac4fdd12ed057"}
 window.__ModuleLoader__.load({
 	id: "weir-harness",
 	factory: (require) => {
@@ -122,7 +122,7 @@ window.__ModuleLoader__.load({
 			register: null,
 			lspToggle: null,
 			hashEdit: null,
-			editLock: null,
+			fileLease: null,
 			worktree: null,
 		};
 		// ---- Package-local chunk wiring (composition root) ----
@@ -218,15 +218,15 @@ window.__ModuleLoader__.load({
 			if (!arrival?.chunks) return null;
 			return react_jsx_runtime.jsx(arrival.chunks.LspToggle, { ...props, settingsBus, t: chunkDictionaries.lspToggle ?? props.t });
 		}
-		const loadEditLockChunk = lazyChunks(() => require.async("./client.edit-lock-panel.js").then((chunk) => {
-			chunkDictionaries.register?.("settings.weir.edit-lock", chunk.dictionaries);
+		const loadFileLeaseChunk = lazyChunks(() => require.async("./client.file-lease-badge.js").then((chunk) => {
+			chunkDictionaries.register?.("settings.weir.file-lease", chunk.dictionaries);
 			return chunk;
 		}));
-		/** Composer-bar Edit Lock entry: nothing until its chunk arrives. */
-		function EditLockWrapper(props) {
-			const arrival = useChunkArrival(loadEditLockChunk, typeof props.sessionId === "string" && props.sessionId !== "");
+		/** Composer-bar file-lease entry: nothing until its chunk arrives. */
+		function FileLeaseBadgeWrapper(props) {
+			const arrival = useChunkArrival(loadFileLeaseChunk, typeof props.sessionId === "string" && props.sessionId !== "");
 			if (!arrival?.chunks) return null;
-			return react_jsx_runtime.jsx(arrival.chunks.EditLockPanel, { ...props, t: chunkDictionaries.editLock ?? props.t });
+			return react_jsx_runtime.jsx(arrival.chunks.FileLeaseBadge, { ...props, t: chunkDictionaries.fileLease ?? props.t });
 		}
 		// ---- Tab glyphs (ui-entries-and-icons) ----
 		// Three 16x16 stroke glyphs drawn in currentColor, matching the host
@@ -427,7 +427,7 @@ window.__ModuleLoader__.load({
 			chunkDictionaries.register = registerChunkDictionaries;
 			chunkDictionaries.lspToggle = ctx.locale.bind("settings.weir.lsp-toggle");
 			chunkDictionaries.hashEdit = ctx.locale.bind("settings.weir.hash-edit");
-			chunkDictionaries.editLock = ctx.locale.bind("settings.weir.edit-lock");
+			chunkDictionaries.fileLease = ctx.locale.bind("settings.weir.file-lease");
 			chunkDictionaries.worktree = ctx.locale.bind("settings.weir.worktree");
 			const pageT = ctx.locale.bind("settings.weir.page");
 			const capabilityT = ctx.locale.bind("settings.weir.capability");
@@ -619,28 +619,20 @@ window.__ModuleLoader__.load({
 				key: "hash_edit",
 				locale: NS
 			}, HashEditToolView)), "ui-weir-settings: hash_edit toolview");
-			// Edit Lock entry: renders only while the `edit-lock` command exists
-			// (feature enabled). Each action is an explicit human /edit-lock run.
+			// File-lease ownership entry (edit-lock rebuild D13): the read-only
+			// badge of the file-lease feature. It carries NO action verb and no
+			// command bridge — every ownership state resolves by itself (turn end,
+			// expiry, negotiation) — and its single read is the read-only view
+			// endpoint, so nothing in this surface can write to the conversation.
 			ctx.effect(() => ctx.slots.inject("conversation.input.right", () => ctx.slots.register({
 				name: "conversation.input.right",
-				id: "weir-edit-lock",
+				id: "weir-file-lease",
 				order: 101,
 				locale: NS,
 				inject: (sessionId) => {
 					if (!sessionId) return {};
 					return {
 						sessionId,
-						runEditLock: async (verb) => {
-							if (!ctx.remote.commands?.execute) return { kind: "error", text: "unknown command: /edit-lock" };
-							const result = await ctx.remote.commands.execute(sessionId, `/edit-lock ${verb}`, []);
-							if (!result.ok) return { kind: "error", text: `${result.error.message} (${result.error.code})` };
-							if (result.value === undefined) return { kind: "error", text: "unknown command: /edit-lock" };
-							return result.value.result;
-						},
-						commandsList: (sid) => {
-							if (!ctx.remote.commands?.list) return Promise.resolve([]);
-							return ctx.remote.commands.list(sid).then((result) => (result.ok ? result.value : []));
-						},
 						// Structured view: read-only, never written to the conversation.
 						fetchView: async () => {
 							const result = await httpChannel("api/weir-edit-lock/view", { sessionId });
@@ -649,7 +641,7 @@ window.__ModuleLoader__.load({
 						}
 					};
 				}
-			}, EditLockWrapper)), "ui-weir-settings: edit lock entry");
+			}, FileLeaseBadgeWrapper)), "ui-weir-settings: file lease badge");
 			// ---- Worktree lane surfaces ----
 			// Each surface registers in its own effect so one failure cannot take
 			// down the others (same discipline as the hash_edit view). Reads go to
@@ -1064,15 +1056,14 @@ window.__ModuleLoader__.load({
 							require.async("./client.chain-model.js"),
 							require.async("./client.robash-model.js"),
 							require.async("./client.lsp-model.js"),
-							require.async("./client.notify-permissions.js"),
-							require.async("./client.edit-lock-maintenance.js")
-						]).then(([settingsPage, chainEditor, robashEditor, disabledCategoriesEditor, lspPanel, chainModel, robashModel, lspModel, notifyPermissions, editLockMaintenance]) => {
+							require.async("./client.notify-permissions.js")
+						]).then(([settingsPage, chainEditor, robashEditor, disabledCategoriesEditor, lspPanel, chainModel, robashModel, lspModel, notifyPermissions]) => {
 							// The whole settings card tree shares one t (the page
 							// namespace): every batch chunk's data face merges into ONE
 							// registration — a duplicate (namespace, locale) pair would
 							// throw, so per-feature namespaces are not an option here.
 							const pageDictionaries = { en: {}, zh: {} };
-							for (const chunk of [settingsPage, chainModel, robashModel, lspModel, disabledCategoriesEditor, notifyPermissions, editLockMaintenance]) {
+							for (const chunk of [settingsPage, chainModel, robashModel, lspModel, disabledCategoriesEditor, notifyPermissions]) {
 								Object.assign(pageDictionaries.en, chunk.dictionaries?.en);
 								Object.assign(pageDictionaries.zh, chunk.dictionaries?.zh);
 							}
@@ -1094,8 +1085,7 @@ window.__ModuleLoader__.load({
 								// The HTTP channel adapter reaches every fetch-talking editor
 								// through the same prop (composition-root injection: a chunk
 								// never builds its own carrier).
-								NotifyPermissionsField: (editorProps) => react_jsx_runtime.jsx(notifyPermissions.NotifyPermissionsField, { ...editorProps, channel: httpChannel }),
-								EditLockMaintenanceField: (editorProps) => react_jsx_runtime.jsx(editLockMaintenance.EditLockMaintenanceField, { ...editorProps, channel: httpChannel })
+								NotifyPermissionsField: (editorProps) => react_jsx_runtime.jsx(notifyPermissions.NotifyPermissionsField, { ...editorProps, channel: httpChannel })
 							};
 							return { settingsPage, editors };
 						}, (error) => {

package/lib/client.settings-page.js

@@ -47,7 +47,7 @@ window.__ModuleLoader__.load({
 		// scatter). test/client-settings-page.test.js pins this list to
 		// RESTART_KEYS from src/settings/sections.js, so a declaration
 		// change on either side cannot drift the two sides.
-		const RESTART_FIELDS = ["intentGateClassifier", "intentGateProvider", "intentGateModel", "intentGateReasoningEffort", "intentGateTimeoutMs", "jevEndpoint", "jevModel", "jevApiKeyEnv", "todoEnabled", "todoMaxConsecutive", "todoErrorRetryMax", "todoErrorBackoffBaseMs", "todoErrorBackoffCapMs", "hashlineHideStockEdit", "editLockEnabled"];
+		const RESTART_FIELDS = ["intentGateClassifier", "intentGateProvider", "intentGateModel", "intentGateReasoningEffort", "intentGateTimeoutMs", "jevEndpoint", "jevModel", "jevApiKeyEnv", "todoEnabled", "todoMaxConsecutive", "todoErrorRetryMax", "todoErrorBackoffBaseMs", "todoErrorBackoffCapMs", "hashlineHideStockEdit"];
 		// ---- condition declaration shorthands (frozen pure data, D2) ----
 		const enabledWhen = (key) => Object.freeze({ key, equals: true });
 		const CLASSIFIER_LLM = Object.freeze({ key: "intentGateClassifier", equals: "llm" });
@@ -107,10 +107,8 @@ window.__ModuleLoader__.load({
 			] },
 			{ id: "editing", fields: [
 				{ field: "hashlineHideStockEdit", kind: "boolean" },
-				{ field: "editLockEnabled", kind: "boolean" },
-				{ field: "editLockAutoResume", kind: "boolean", parent: "editLockEnabled", when: enabledWhen("editLockEnabled") },
-				{ field: "editLockStaleSweep", kind: "boolean", parent: "editLockEnabled", when: enabledWhen("editLockEnabled") },
-				// Diagnostics must remain reachable when enforcement is off.
+				// Edit Lock diagnostics seat: the composition root binds no editor
+				// for it (edit-lock rebuild), so the row renders nothing.
 				{ kind: "custom", slot: "editLockMaintenance" }
 			] },
 			{ id: "worktree", fields: [
@@ -194,14 +192,6 @@ window.__ModuleLoader__.load({
 			guardSoftThreshold: 0.72,
 			guardHardThreshold: 0.88,
 			hashlineHideStockEdit: true,
-			editLockEnabled: true,
-			editLockHoldDefaultMinutes: 30,
-			editLockHoldSingleMaxMinutes: 30,
-			editLockHoldCumulativeMaxMinutes: 120,
-			editLockNudgeAttempts: 2,
-			editLockNudgeFallback: "release",
-			editLockAutoResume: true,
-			editLockStaleSweep: true,
 			robashEnabled: true,
 			lspEnabled: false,
 			lspIdleMs: 600000,
@@ -597,7 +587,6 @@ window.__ModuleLoader__.load({
 		const childLabelStyle = { ...labelStyle, fontSize: "13px" };
 		const labelTextStyle = { display: "inline-flex", alignItems: "center", gap: "6px" };
 		const hintStyle = { fontSize: "12px", lineHeight: "16px", color: "var(--dsw-alias-label-secondary)" };
-		const optOutStyle = { ...hintStyle, color: "var(--dsw-alias-state-warn-primary)", borderLeft: "2px solid var(--dsw-alias-state-warn-primary)", paddingLeft: "8px", marginTop: "4px" };
 		// Card-based group sections (design D7): layered background, l1 border,
 		// radius, the group title inside the card top, hairline l2 separators
 		// between rows. Colors only from theme tokens; geometry hardcoded.
@@ -637,9 +626,6 @@ window.__ModuleLoader__.load({
 				react_jsx_runtime.jsxs("div", { style: labelGroupStyle, children: [
 					labelWithTag(descriptor, t, depth > 0 ? childLabelStyle : labelStyle),
 					react_jsx_runtime.jsx("span", { style: hintStyle, children: t(`${descriptor.field}Hint`) }),
-					descriptor.field === "editLockEnabled" && resolveEffectiveValue(descriptor, field, field?.saved) !== true
-						? react_jsx_runtime.jsx("span", { style: optOutStyle, role: "alert", children: t("editLockOptOutWarning") })
-						: null
 				] }),
 				react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", alignItems: "flex-end", gap: "4px" }, children: [
 					descriptor.kind === "boolean" ? react_jsx_runtime.jsx(primitives.Switch, {
@@ -925,9 +911,13 @@ window.__ModuleLoader__.load({
 						}));
 					}
 					if (node.slot === "editLockMaintenance") {
-						// Edit Lock maintenance: profile-wide switch status and
-						// read-only authority diagnostics (read-only).
-						return wrap(react_jsx_runtime.jsx(props.editors.EditLockMaintenanceField, { t }));
+						// The Edit Lock maintenance seat is GONE (edit-lock rebuild):
+						// the composition root no longer binds an editor for it, and
+						// the row disappears with the settings keys. An unbound seat
+						// must leave the card intact instead of rendering an undefined
+						// element type, so the row simply renders nothing here.
+						const MaintenanceField = props.editors?.EditLockMaintenanceField;
+						return typeof MaintenanceField === "function" ? wrap(react_jsx_runtime.jsx(MaintenanceField, { t })) : null;
 					}
 					// notifyPermissions: the macOS-only permission entry
 					return wrap(react_jsx_runtime.jsx(props.editors.NotifyPermissionsField, { t }));
@@ -1113,13 +1103,6 @@ window.__ModuleLoader__.load({
 				guardHardThresholdHint: "Above this fill ratio compaction is requested (default 0.88; not a completion guarantee).",
 				hashlineHideStockEdit: "Anchor editing only",
 				hashlineHideStockEditHint: "Hides the built-in edit tool; file edits go through hash_edit anchors only.",
-				editLockEnabled: "Edit Lock",
-				editLockEnabledHint: "Sessions take turns editing the same files instead of overwriting each other.",
-				editLockOptOutWarning: "Edit Lock is set to off. After saving, restart DeepSeek Harness to apply the change. Once enforcement is off, ordinary editing is UNPROTECTED and can overwrite another session's work. Old fences and history are retained and may block files when you re-enable Edit Lock.",
-				editLockAutoResume: "Message resumes editing",
-				editLockAutoResumeHint: "After a session is stopped, sending any message restores its editing right and re-confirms its kept files (default on).",
-				editLockStaleSweep: "Sweep stale locks",
-				editLockStaleSweepHint: "Locks whose target file was deleted or moved are re-verified and released as you send messages (default on).",
 				worktreeEnabled: "Worktree lanes",
 				worktreeEnabledHint: "Lets the assistant work in isolated git worktrees: lane tools, the /worktree command, and the lanes panel.",
 				worktreeAutoSetup: "Auto-install in new lanes",
@@ -1248,13 +1231,6 @@ window.__ModuleLoader__.load({
 				guardHardThresholdHint: "上下文用量超过该比例时请求立即压缩（默认 0.88，不保证压缩完成）。",
 				hashlineHideStockEdit: "仅用锚点编辑",
 				hashlineHideStockEditHint: "隐藏内置 edit 工具，文件修改一律走 hash_edit 锚点编辑。",
-				editLockEnabled: "编辑锁",
-				editLockEnabledHint: "多个会话轮流编辑同一批文件，而不是互相覆盖。",
-				editLockOptOutWarning: "编辑锁已设为关闭。保存后须重启 DeepSeek Harness 才会生效。停用强制执行后，普通编辑不受保护，可能覆盖其他会话的工作。旧围栏与历史仍会保留，重新启用编辑锁时可能再次阻塞文件。",
-				editLockAutoResume: "发消息即恢复编辑",
-				editLockAutoResumeHint: "会话被停止后，发送任意消息即自动恢复其编辑权并确认保留的文件（默认开启）。",
-				editLockStaleSweep: "自动清理失效锁",
-				editLockStaleSweepHint: "目标文件已被删除或移动的锁，在你发消息时自动复核并释放（默认开启）。",
 				worktreeEnabled: "Worktree 车道",
 				worktreeEnabledHint: "让助手在隔离的 git worktree 中工作：车道工具、/worktree 命令与车道面板。",
 				worktreeAutoSetup: "新车道自动安装依赖",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weir-harness",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "type": "module",
   "description": "Weir \u2014 orchestrator-centric DSH agent preset: intent gate, category delegation, todo driver, pull-based background jobs, auto-compaction, hashline edit.",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "./todo-driver": "./src/todo-driver/index.js",
     "./context-guard": "./src/context-guard/index.js",
     "./hashline-edit": "./src/hashline-edit/index.js",
-    "./edit-lock": "./src/edit-lock/index.js",
+    "./file-lease": "./src/file-lease/plugin.js",
     "./blackboard": "./src/blackboard/index.js",
     "./blackboard-remote": "./src/blackboard/remote.js",
     "./worktree": "./src/worktree/index.js",

package/src/capabilities/store/checked-contract.d.ts

@@ -1,6 +1,6 @@
 // Augmentations of the narrow checked-graph platform contract
-// (types/platform.d.ts) for the capability-store liveness/lock modules: the
-// edit-lock reservation reuses them, which pulls them into the checked graph.
+// (types/platform.d.ts) for the capability-store liveness/lock modules: they
+// pull these declarations into the checked graph.
 // Same discipline as the base contract — runtime modules remain supplied by
 // Node; these declarations only describe what the checked graph uses.
 declare module 'node:fs' {

package/src/capabilities/store/fs-adapter.js

@@ -21,9 +21,8 @@ import { link, mkdir, open, readFile, readdir, rename, unlink } from 'node:fs/pr
 // Directory fsync is a POSIX crash-durability idiom: on Windows the directory
 // handle opens but sync fails EPERM (verified on Node v24, NTFS). The win32
 // store row (SUPPORTED_PLATFORMS in store.js) therefore commits with
-// file-level fsync + atomic rename only — the same platform stance the
-// edit-lock reservation already takes (reservation.js SYNC_SUPPORTED). The
-// durability tradeoff is documented in docs/features/session-capability-manager.md.
+// file-level fsync + atomic rename only. The durability tradeoff is documented
+// in docs/features/session-capability-manager.md.
 const DIR_SYNC_SUPPORTED = process.platform === 'darwin' || process.platform === 'linux'
 
 // Windows file-locking etiquette: antivirus and the search indexer briefly