weir-harness 1.1.5 → 1.1.6

package/icon.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><rect width="160" height="160" rx="36" fill="#0A0A0B"/><g transform="translate(80 80) scale(.72) translate(-80 -84)"><polygon points="16,48 30,48 56,126 80,56 104,126 130,48 144,48 144,144 16,144" fill="#ECECE6"/><rect x="16" y="24" width="128" height="10" fill="#CCFF00"/></g></svg>

package/lib/client.edit-lock-panel.js

@@ -88,7 +88,7 @@ window.__ModuleLoader__.load({
 			// Continue editing is one human action: restore authority, then confirm the
 			// retained files (each through the ordinary per-file check).
 			// confirm --all only when something waits, so no empty "Confirmed 0 of 0" is recorded.
-			if (state === "stopped") return { verbs: view.files.some((file) => file.mine && file.status === "user-interrupted") ? ["resume", "confirm --all"] : ["resume"], label: "editLockResume" };
+			if (state === "stopped" || state === "revoked") return { verbs: view.files.some((file) => file.mine && file.status === "user-interrupted") ? ["resume", "confirm --all"] : ["resume"], label: "editLockResume" };
 			if (state === "confirm") return { verb: "confirm --all", label: "editLockConfirmAll" };
 			if (state === "holding" && view.ownCount > 0) return { verbs: view.files.filter((file) => file.mine && file.action === "release").map(rowCommand), label: "editLockReleaseAll" };
 			return null;
@@ -209,7 +209,8 @@ window.__ModuleLoader__.load({
 				] }, "head"),
 				view?.reason && !bindingRefusal ? jsx("div", { style: { ...errorStyle, wordBreak: "break-word" }, "data-weir-edit-lock-reason": "", children: view.reason }, "reason") : null,
 				view?.bindingFailure ? jsx("div", { style: mutedStyle, "data-weir-edit-lock-binding": "", children: t(`editLockBinding_${view.bindingFailure.holderKind ?? "unknown"}`) }, "binding") : null,
-				state === "revoked" ? jsx("div", { style: { ...mutedStyle, marginTop: "4px" }, "data-weir-edit-lock-revoked": "", children: t("editLockRevokedHint") }, "revoked") : null,
+				state === "revoked" && !cold ? jsx("div", { style: { ...mutedStyle, marginTop: "4px" }, "data-weir-edit-lock-revoked": "", children: t("editLockRevokedHint") }, "revoked") : null,
+				cold && state === "revoked" ? jsx("div", { style: { ...mutedStyle, marginTop: "4px" }, "data-weir-edit-lock-cold": "", children: t(view.autoResume === false ? "editLockColdRevokedManual" : "editLockColdRevokedAuto") }, "cold") : null,
 				cold && state === "stopped" ? jsx("div", { style: { ...mutedStyle, marginTop: "4px" }, "data-weir-edit-lock-cold": "", children: t(view.autoResume === false ? "editLockColdResumeManual" : "editLockColdResumeAuto") }, "cold") : null,
 				// Usage is historical; only the live driver's explicit deadline signals a pause.
 				// Follow-up locale keys: editLockCleanupOnly, editLockRecoveryUsage,

package/lib/client.js

@@ -1,4 +1,4 @@
-// Weir client chunks: {"client.blackboard-model.js":"66fd9fc5438477d6d7ff156631f810a647ce352612a16051e987e8cd449bc4c9","client.blackboard-panel.js":"f961e0242dad7bf311829a25e265bf091925711b2fb9c19d2141997fbdf792b5","client.capability-badge.js":"6ffd703f498e0aa5cc8ac78f244402ec4ceee56d22d2a0e74c246799565776cc","client.capability-manager.js":"d8d1076e1b624c1dfc0834ad393c05fd7d9ee35004cd2fb34e5e5ba83f44c902","client.capability-model.js":"d0ad248c4a6defbc90f79c8c0e7904639779d47927874b8663c15c6cecb9d54a","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"81cdd04626900a63c38ccb3d9c4d117686c6f8a5da2ce9131b7aaf2f089dea77","client.disabled-categories-editor.js":"d4606a3172b47b25caf76fd64c8420a0079cd5f008bc67a9c71b3f146724e393","client.edit-lock-maintenance.js":"f5dca1a7658e2f536b52d265c49ab37bb5d2df6bcd6cf21826b843c9554311a8","client.edit-lock-panel.js":"3889bcb48de6ff185d0b8d2ee457f51269710e8a748fa5de85fb9983a3ad5655","client.hash-edit-model.js":"99df87cc3cc261abd160b83124b5ce726d0708f3c87eba9d58ad9e5a1f41bae9","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"6b5bead2900289427a1ad723b9c7bea85af4c5547029e486c620ff94ece24775","client.lsp-panel.js":"39211da7658e0810abc0984b8bcbbfb4ee6a6299fedfd21649ded1ab39d1f291","client.lsp-toggle.js":"4d960984ccf1045c617be6d282665513a9cf636779563a276973b55036a59fb6","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"c1c103ce5976a4032b62e12b3b3ecb907a574159bf89512539c68c4886ea37a7","client.notify-web.js":"b2ccf831524be4e94c532324cb5495793d4424e3b78d6014d2a3f3d20e9c5871","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"356ee7a679223bcd351720b2bc9e7300e390d97a60d1c8d75998706b4644923b","client.settings-page.js":"3f33da4ce1676721e38e5437653a2d706948ddb3f2afc6507e03d79a596339b9","client.worktree-model.js":"819f1b00650aa0bb01140690b29b4a1f09b9d26e6bb73adc7efbb3a08e215766","client.worktree-view.js":"4cf79e1231c8f0eab6692c986c11ef4e363b2f5968458f3c14e396a3aade7ee3"}
+// Weir client chunks: {"client.blackboard-model.js":"66fd9fc5438477d6d7ff156631f810a647ce352612a16051e987e8cd449bc4c9","client.blackboard-panel.js":"f961e0242dad7bf311829a25e265bf091925711b2fb9c19d2141997fbdf792b5","client.capability-badge.js":"6ffd703f498e0aa5cc8ac78f244402ec4ceee56d22d2a0e74c246799565776cc","client.capability-manager.js":"d8d1076e1b624c1dfc0834ad393c05fd7d9ee35004cd2fb34e5e5ba83f44c902","client.capability-model.js":"d0ad248c4a6defbc90f79c8c0e7904639779d47927874b8663c15c6cecb9d54a","client.capability-presets.js":"12ac8da3568d013abd76b67cfe473a329f4af2feaac9cd55a82d8881e5bc1017","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"81cdd04626900a63c38ccb3d9c4d117686c6f8a5da2ce9131b7aaf2f089dea77","client.disabled-categories-editor.js":"d4606a3172b47b25caf76fd64c8420a0079cd5f008bc67a9c71b3f146724e393","client.edit-lock-maintenance.js":"f5dca1a7658e2f536b52d265c49ab37bb5d2df6bcd6cf21826b843c9554311a8","client.edit-lock-panel.js":"54f7a21b79adc2b91803c61d92b0dad72d95d5d320fdf35433719cefd0a6c46d","client.hash-edit-model.js":"99df87cc3cc261abd160b83124b5ce726d0708f3c87eba9d58ad9e5a1f41bae9","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"6b5bead2900289427a1ad723b9c7bea85af4c5547029e486c620ff94ece24775","client.lsp-panel.js":"39211da7658e0810abc0984b8bcbbfb4ee6a6299fedfd21649ded1ab39d1f291","client.lsp-toggle.js":"4d960984ccf1045c617be6d282665513a9cf636779563a276973b55036a59fb6","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"c1c103ce5976a4032b62e12b3b3ecb907a574159bf89512539c68c4886ea37a7","client.notify-web.js":"b2ccf831524be4e94c532324cb5495793d4424e3b78d6014d2a3f3d20e9c5871","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"356ee7a679223bcd351720b2bc9e7300e390d97a60d1c8d75998706b4644923b","client.settings-page.js":"3f33da4ce1676721e38e5437653a2d706948ddb3f2afc6507e03d79a596339b9","client.worktree-model.js":"819f1b00650aa0bb01140690b29b4a1f09b9d26e6bb73adc7efbb3a08e215766","client.worktree-view.js":"356c3f5f683b8509ae8679243a6460ca02957fd15e057a629b2ac4fdd12ed057"}
 window.__ModuleLoader__.load({
 	id: "weir-harness",
 	factory: (require) => {
@@ -183,8 +183,10 @@ window.__ModuleLoader__.load({
 			editLockState_confirm: "Waiting for you to continue",
 			editLockState_stopped: "Editing stopped",
 			editLockState_attention: "Needs your attention",
-			editLockState_revoked: "Editing permanently revoked",
-			editLockRevokedHint: "An administrative recovery permanently revoked this session's editing authority. It cannot be continued; open a new conversation to edit this workspace.",
+			editLockState_revoked: "Editing revoked by an administrator",
+			editLockRevokedHint: "An administrative recovery revoked this session's editing authority and released its locks. Continue editing here, or send any message — editing resumes automatically in a new execution epoch; the revocation record is preserved.",
+			editLockColdRevokedAuto: "An administrative recovery revoked this session's editing authority and released its locks. Send any message in this session — the binding and editing resume automatically.",
+			editLockColdRevokedManual: "An administrative recovery revoked this session's editing authority and released its locks. Send any message to activate the session, then continue editing from this panel.",
 			editLockColdResumeAuto: "This session was restored after a restart and is stopped. Send any message — editing resumes automatically, with the files below confirmed again.",
 			editLockColdResumeManual: "This session was restored after a restart and is stopped. Send any message to activate the session, then continue editing from this panel.",
 			editLockState_unavailable: "Edit Lock is starting",
@@ -725,6 +727,7 @@ window.__ModuleLoader__.load({
 			blackboardTabLabel: "Blackboard",
 			blackboardGuideTitle: "Session blackboard",
 			blackboardGuideDescription: "Findings shared across this session: entries, usage counts, arbitrated editing.",
+			blackboardPillTitle: "Open the session blackboard",
 			"blackboard.title": "Blackboard",
 			"blackboard.entries": "{n} entries",
 			"blackboard.loading": "Loading the board…",
@@ -942,8 +945,10 @@ window.__ModuleLoader__.load({
 			editLockState_confirm: "等你确认继续",
 			editLockState_stopped: "编辑已停止",
 			editLockState_attention: "需要你处理",
-			editLockState_revoked: "编辑权已被永久撤销",
-			editLockRevokedHint: "管理员恢复已永久撤销本会话的编辑权，无法继续编辑；请开新会话编辑本工作区。",
+			editLockState_revoked: "编辑权已被管理员吊销",
+			editLockRevokedHint: "管理员恢复已吊销本会话的编辑权并释放其锁。点击「继续编辑」或发送任意消息，即在新执行纪元恢复编辑；吊销记录保留。",
+			editLockColdRevokedAuto: "管理员恢复已吊销本会话的编辑权并释放其锁。在本会话发送任意消息——连接与编辑会自动恢复。",
+			editLockColdRevokedManual: "管理员恢复已吊销本会话的编辑权并释放其锁。发送任意消息激活会话，然后回到此面板点「继续编辑」。",
 			editLockColdResumeAuto: "重启后恢复的会话，编辑已停止。发送任意消息即自动恢复编辑（下列文件会一并确认）。",
 			editLockColdResumeManual: "重启后恢复的会话，编辑已停止。发送任意消息激活会话，然后回到此面板点「继续编辑」。",
 			editLockState_unavailable: "编辑锁启动中",
@@ -1481,6 +1486,7 @@ window.__ModuleLoader__.load({
 			blackboardTabLabel: "黑板",
 			blackboardGuideTitle: "会话黑板",
 			blackboardGuideDescription: "本会话共享的发现：条目、用量计数与仲裁编辑。",
+			blackboardPillTitle: "打开会话黑板",
 			"blackboard.title": "黑板",
 			"blackboard.entries": "{n} 条",
 			"blackboard.loading": "正在加载黑板…",
@@ -1639,6 +1645,88 @@ window.__ModuleLoader__.load({
 			if (!arrival?.chunks) return null;
 			return react_jsx_runtime.jsx(arrival.chunks.EditLockPanel, props);
 		}
+		// ---- Tab glyphs (ui-entries-and-icons) ----
+		// Three 16x16 stroke glyphs drawn in currentColor, matching the host
+		// CompassGlyph/CubeGlyph style (no strokeWidth, rounded caps/joins).
+		// The guide capsule icon and the tab chip title are registered eagerly
+		// at apply time, so the glyph components MUST live inline in this
+		// entry — a lazy chunk would flash the host's placeholder cube.
+		/** @param {object} props @param {Array} children */
+		function glyphSvg(props, children) {
+			const size = props.size ?? 16;
+			return react_jsx_runtime.jsx("svg", {
+				width: size, height: size, viewBox: "0 0 16 16", fill: "none",
+				"aria-hidden": "true", className: props.className, style: props.style,
+				stroke: "currentColor", strokeLinecap: "round", strokeLinejoin: "round",
+				children
+			});
+		}
+		/** Worktree: git-branch fork (same geometry as the panel chunk's branch icon). */
+		function WorktreeGlyph(props) {
+			return glyphSvg(props, [
+				react_jsx_runtime.jsx("circle", { cx: 4.5, cy: 3, r: 1.8 }, "c1"),
+				react_jsx_runtime.jsx("circle", { cx: 4.5, cy: 13, r: 1.8 }, "c2"),
+				react_jsx_runtime.jsx("circle", { cx: 11.5, cy: 5.5, r: 1.8 }, "c3"),
+				react_jsx_runtime.jsx("path", { d: "M4.5 4.8v6.4M4.5 11.2c2.8 0 7-.8 7-3.9" }, "p")
+			]);
+		}
+		/** Capabilities: two horizontal sliders. */
+		function CapabilityGlyph(props) {
+			return glyphSvg(props, [
+				react_jsx_runtime.jsx("path", { d: "M2.4 5.2h11.2M2.4 10.8h11.2" }, "l"),
+				react_jsx_runtime.jsx("circle", { cx: 6, cy: 5.2, r: 1.7 }, "c1"),
+				react_jsx_runtime.jsx("circle", { cx: 10, cy: 10.8, r: 1.7 }, "c2")
+			]);
+		}
+		/** Blackboard: a board rectangle with list lines. */
+		function BlackboardGlyph(props) {
+			return glyphSvg(props, [
+				react_jsx_runtime.jsx("rect", { x: 2, y: 2.6, width: 12, height: 10.8, rx: 1.6 }, "r"),
+				react_jsx_runtime.jsx("path", { d: "M4.6 5.8h4.2M4.6 8h6.8M4.6 10.2h5.4" }, "l")
+			]);
+		}
+		// Tab chip title: icon + the host-provided tab title (the host's own
+		// GuideTitle renders glyph + tab.title the same way). Icon styling is
+		// inline — the shell's CSS-module classes are unreachable from a bundle.
+		const tabChipIconStyle = { marginRight: "5px", color: "var(--dsw-alias-label-tertiary)", flex: "none", display: "inline-block", verticalAlign: "-2px" };
+		const tabChipTitle = (Glyph) => {
+			function WeirTabChipTitle({ useTabInfo }) {
+				return react_jsx_runtime.jsxs(react_jsx_runtime.Fragment, { children: [
+					react_jsx_runtime.jsx(Glyph, { size: 12, style: tabChipIconStyle }, "icon"),
+					useTabInfo().tab.title
+				] });
+			}
+			return WeirTabChipTitle;
+		};
+		// Blackboard session-header quick entry (D2): a bordered badge pill — glyph
+		// plus the localized tab label — so it reads as a control next to the
+		// worktree pill. No live lane state to poll, so no chunk and no model; hover
+		// paint follows the capability badge's inline-style pattern.
+		const blackboardPillStyle = {
+			display: "inline-flex", alignItems: "center", gap: "5px",
+			padding: "1px 7px", fontSize: "11px", lineHeight: "16px", fontWeight: 600,
+			color: "var(--dsw-alias-label-secondary)", cursor: "pointer", background: "none",
+			border: "1px solid var(--dsw-alias-border-l3, rgba(127,127,127,.35))",
+			borderRadius: "var(--dsw-radius-sm)"
+		};
+		function BlackboardPill(props) {
+			const title = typeof props.t === "function" ? props.t("blackboardPillTitle") : "Open the session blackboard";
+			const label = typeof props.t === "function" ? props.t("blackboardTabLabel") : "Blackboard";
+			return react_jsx_runtime.jsxs("button", {
+				type: "button",
+				style: blackboardPillStyle,
+				onClick: () => props.openPanel?.(),
+				onMouseEnter: (event) => { event.currentTarget.style.background = "var(--dsw-alias-interactive-bg-hover, rgba(127,127,127,.10))"; },
+				onMouseLeave: (event) => { event.currentTarget.style.background = "none"; },
+				title,
+				"aria-label": title,
+				"data-weir-blackboard-pill": "",
+				children: [
+					react_jsx_runtime.jsx(BlackboardGlyph, { size: 11 }, "icon"),
+					react_jsx_runtime.jsx("span", { children: label }, "label")
+				]
+			});
+		}
 		// ---- Worktree lanes surfaces ----
 		// One model chunk plus one view chunk carry every lane surface; the
 		// composition root binds them to the ctx closures below. A session needs
@@ -1924,7 +2012,8 @@ window.__ModuleLoader__.load({
 						id: "worktree",
 						order: 30,
 						title: () => sidebarScope.locale.bind(NS)("worktreeGuideTitle"),
-						description: () => sidebarScope.locale.bind(NS)("worktreeGuideDescription")
+						description: () => sidebarScope.locale.bind(NS)("worktreeGuideDescription"),
+						icon: WorktreeGlyph
 					}]
 				}), "ui-weir-settings: worktree tab type");
 				sidebarScope.effect(() => sidebarScope.slots.register({
@@ -1939,6 +2028,11 @@ window.__ModuleLoader__.load({
 						commandsList: () => worktreeCommandsList(sessionId)
 					} : {})
 				}, WorktreePanelWrapper), "ui-weir-settings: worktree panel body");
+				sidebarScope.effect(() => sidebarScope.slots.register({
+					name: "sidebar.right.pane.tab.title",
+					key: tabId,
+					locale: NS
+				}, tabChipTitle(WorktreeGlyph)), "ui-weir-settings: worktree tab title");
 			});
 			// Session capability Badge in the composer bar (12.1): order 95, next
 			// to the LSP toggle (order 100). The wrapper registers synchronously
@@ -2141,7 +2235,8 @@ window.__ModuleLoader__.load({
 						id: "capabilities",
 						order: 40,
 						title: () => sidebarScope.locale.bind(NS)("capabilityGuideTitle"),
-						description: () => sidebarScope.locale.bind(NS)("capabilityGuideDescription")
+						description: () => sidebarScope.locale.bind(NS)("capabilityGuideDescription"),
+						icon: CapabilityGlyph
 					}]
 				}), "ui-weir-settings: capability tab type");
 				sidebarScope.effect(() => sidebarScope.slots.register({
@@ -2150,6 +2245,11 @@ window.__ModuleLoader__.load({
 					locale: NS,
 					inject: (sessionId) => (sessionId ? capabilityVerbs(sessionId) : {})
 				}, CapabilityPanelWrapper), "ui-weir-settings: capability panel body");
+				sidebarScope.effect(() => sidebarScope.slots.register({
+					name: "sidebar.right.pane.tab.title",
+					key: tabId,
+					locale: NS
+				}, tabChipTitle(CapabilityGlyph)), "ui-weir-settings: capability tab title");
 			});
 			// ---- Session blackboard panel (slice 2, tasks 2.3/2.4) ----
 			// The board data channel is the plugin-owned typert remote
@@ -2201,7 +2301,8 @@ window.__ModuleLoader__.load({
 						id: "blackboard",
 						order: 50,
 						title: () => sidebarScope.locale.bind(NS)("blackboardGuideTitle"),
-						description: () => sidebarScope.locale.bind(NS)("blackboardGuideDescription")
+						description: () => sidebarScope.locale.bind(NS)("blackboardGuideDescription"),
+						icon: BlackboardGlyph
 					}]
 				}), "ui-weir-settings: blackboard tab type");
 				sidebarScope.effect(() => sidebarScope.slots.register({
@@ -2210,7 +2311,27 @@ window.__ModuleLoader__.load({
 					locale: NS,
 					inject: (sessionId) => (sessionId ? { sessionId, callBoard: blackboardRawCall } : {})
 				}, BlackboardPanelWrapper), "ui-weir-settings: blackboard panel body");
+				sidebarScope.effect(() => sidebarScope.slots.register({
+					name: "sidebar.right.pane.tab.title",
+					key: tabId,
+					locale: NS
+				}, tabChipTitle(BlackboardGlyph)), "ui-weir-settings: blackboard tab title");
 			});
+			// Blackboard quick entry in the session header utilities row (D2):
+			// order 20, after the worktree pill (order 10). A shell without the
+			// sidebar right package keeps the button; openPanel then no-ops.
+			ctx.effect(() => ctx.slots.inject("conversation.session.header.utilities", () => ctx.slots.register({
+				name: "conversation.session.header.utilities",
+				id: "weir-blackboard-pill",
+				order: 20,
+				locale: NS,
+				inject: (sessionId) => (sessionId ? {
+					sessionId,
+					openPanel: () => {
+						try { ctx.get("sidebarRight")?.openTab?.("weir-blackboard"); } catch { /* no sidebar in this shell */ }
+					}
+				} : {})
+			}, BlackboardPill)), "ui-weir-settings: blackboard header pill");
 			// Top-level Settings section (same place as dsh-web-kimi and the
 			// built-in General/Models sections), with a nested item slot
 			// hosting the form — the single Weir settings entry.

package/lib/client.worktree-view.js

@@ -260,7 +260,16 @@ window.__ModuleLoader__.load({
 				],
 			});
 		}
-		/** U2 — session header status pill: badge look, warning tint on awaiting/base-moved, click opens the panel. */
+		/** U2 — session header status pill: the same bordered badge as the blackboard
+		 * header entry (branch glyph + label) on a neutral base; warning tone on
+		 * awaiting/base-moved, click opens the panel. */
+		const statusPillStyle = {
+			display: "inline-flex", alignItems: "center", gap: "5px",
+			padding: "1px 7px", fontSize: "11px", lineHeight: "16px", fontWeight: 600,
+			color: "var(--dsw-alias-label-secondary)", cursor: "pointer", background: "none",
+			border: "1px solid var(--dsw-alias-border-l3, rgba(127,127,127,.35))",
+			borderRadius: "var(--dsw-radius-sm)"
+		};
 		function WorktreeStatusPill(props) {
 			const available = useCommandPresence(props);
 			const enabled = available === true;
@@ -274,19 +283,25 @@ window.__ModuleLoader__.load({
 			if (summary.active > 0) parts.push(t("pillCount").replace("{n}", String(summary.active)));
 			if (summary.awaiting > 0) parts.push(t("pillAwaiting").replace("{n}", String(summary.awaiting)));
 			const attention = summary.baseMoved || summary.awaiting > 0;
-			const color = attention ? WARN : summary.mode ? BUSINESS : "var(--dsw-alias-label-tertiary)";
+			// Attention keeps the documented warning signal — text, border and the
+			// 12% tint — so a base-moved lane or a pending approval still reads at a
+			// glance; every other state carries mode/business purely in the label.
+			const tone = attention ? { color: WARN, background: tint(WARN, 12), border: `1px solid ${WARN}` } : null;
+			// Hover paints the neutral base only: an attention pill keeps its tint
+			// instead of losing it on mouse-leave.
+			const hover = attention ? {} : {
+				onMouseEnter: (event) => { event.currentTarget.style.background = "var(--dsw-alias-interactive-bg-hover, rgba(127,127,127,.10))"; },
+				onMouseLeave: (event) => { event.currentTarget.style.background = "none"; },
+			};
 			return jsxs("button", {
 				type: "button",
-				style: {
-					display: "inline-flex", alignItems: "center", gap: "5px", padding: "1px 7px",
-					fontSize: "11px", lineHeight: "16px", fontWeight: 600, color, cursor: "pointer",
-					background: tint(color, 12), border: `1px solid ${color}`, borderRadius: "var(--dsw-radius-sm)",
-				},
+				style: { ...statusPillStyle, ...tone },
+				...hover,
 				onClick: () => props.openPanel?.(),
 				title: summary.baseMoved ? t("pillBaseMoved") : t("pillTitle"),
 				"data-weir-worktree-pill": "",
 				"data-weir-worktree-state": summary.baseMoved ? "base-moved" : summary.mode ? "on" : "off",
-				children: [jsx(Dot, { color }, "dot"), jsx("span", { children: parts.join(" · ") }, "label")],
+				children: [jsx(Icon, { name: "branch", size: 11 }, "icon"), jsx("span", { children: parts.join(" · ") }, "label")],
 			});
 		}
 		/** One lane card in the panel. */

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "weir-harness",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "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",
+  "icon": "icon.svg",
   "author": "Lim-Young",
   "homepage": "https://github.com/WeirLabs/weir#readme",
   "bugs": "https://github.com/WeirLabs/weir/issues",
@@ -24,7 +25,8 @@
     "lib",
     "skills",
     "cordis.patch.yml",
-    "whitelist-defaults.json"
+    "whitelist-defaults.json",
+    "icon.svg"
   ],
   "peerDependencies": {
     "@deepseek-ai/dsh": ">=0.2.0-rc.2 <0.3.0"

package/src/edit-lock/admin-ledger.js

@@ -13,7 +13,16 @@ export const ONLINE_RECOVERY_ACTOR = 'online-administrator'
 const ACTORS = ['authenticated-settings-administrator', AUTOMATIC_RECOVERY_ACTOR, ONLINE_RECOVERY_ACTOR]
 export const digest = value => createHash('sha256').update(canonical(value)).digest('hex')
 export const dispositionFor = (state, op) => state.adminRecoveries?.find(row => row.owner === op.sessionId && row.operations.some(item => item.operationId === op.operationId))
-export const revokedOwner = (state, owner) => state.adminRecoveries?.some(row => row.owner === owner) === true
+/** Epoch-scoped revocation: a disposition revokes its owner's execution
+ * authority exactly at the recorded revokedEpoch. The owner stays revoked
+ * while its recorded epoch is within it; a trusted resume advances the epoch
+ * past every revokedEpoch and ends the revoked state atomically, without any
+ * ledger change (append-only: dispositions are never removed or altered). */
+export const revokedOwner = (state, owner) => {
+  const session = state.sessions?.find(s => s.sessionId === owner)
+  if (!session) return false
+  return state.adminRecoveries?.some(row => row.owner === owner && session.executionEpoch <= row.revokedEpoch) === true
+}
 
 function requireThat(condition, message) { if (!condition) throw new Error(`invalid administrative recovery: ${message}`) }
 function keys(value, names) {
@@ -28,21 +37,41 @@ export function validateAdminLedger(state) {
   // The v5 ledger exists only once an override lands; a v6 image may carry an
   // empty one (registry upgrade before any administrative recovery).
   if (state.adminRecoveries.length === 0) { requireThat(state.version === 6, 'nonempty v5 ledger'); return }
-  const ids = new Set(), owners = new Set()
+  const ids = new Set()
+  // An owner may be revoked again after a repair: its rows must carry strictly
+  // increasing revokedEpochs in ledger order (the epoch only ever advances).
+  const lastRevokedEpoch = new Map()
+  // Operations bound by an owner's earlier rows are already disposed; a later
+  // row of the same owner never re-covers them.
+  const covered = new Map()
+  // "Still revoked" is judged against the owner's LATEST row at image time.
+  const finalRevokedEpoch = new Map()
+  for (const row of state.adminRecoveries) {
+    if (natural(row?.revokedEpoch) && typeof row?.owner === 'string') {
+      finalRevokedEpoch.set(row.owner, Math.max(row.revokedEpoch, finalRevokedEpoch.get(row.owner) ?? -1))
+    }
+  }
   // Rows committed in one transaction share one expected/committed pair;
   // across transactions both revisions are non-decreasing.
   let lastExpected = -1, lastCommitted = -1
   for (const row of state.adminRecoveries) {
     keys(row, ['recoveryId', 'root', 'owner', 'expectedRevision', 'committedRevision', 'at', 'actor', 'reason', 'risk', 'confirmation', 'backup', 'operations', 'releasedLocks', 'revokedEpoch'])
-    requireThat(text(row.recoveryId, 128) && !ids.has(row.recoveryId) && text(row.root, 4096) && text(row.owner) && !owners.has(row.owner), 'identity')
-    ids.add(row.recoveryId); owners.add(row.owner)
+    requireThat(text(row.recoveryId, 128) && !ids.has(row.recoveryId) && text(row.root, 4096) && text(row.owner), 'identity')
+    ids.add(row.recoveryId)
+    requireThat(natural(row.revokedEpoch) && row.revokedEpoch > (lastRevokedEpoch.get(row.owner) ?? -1), 'revocation epoch progression')
+    lastRevokedEpoch.set(row.owner, row.revokedEpoch)
     requireThat(natural(row.expectedRevision) && natural(row.committedRevision) && row.committedRevision === row.expectedRevision + 1 && row.expectedRevision >= lastExpected && row.committedRevision >= lastCommitted && natural(row.at) && ACTORS.includes(row.actor) && text(row.reason, 2000), 'audit')
     lastExpected = row.expectedRevision; lastCommitted = row.committedRevision
     requireThat(row.risk === LATE_WRITER_RISK && /^[a-f0-9]{64}$/.test(row.confirmation), 'risk acknowledgement')
     keys(row.backup, ['file', 'sha256', 'bytes'])
     requireThat(row.backup.file === `admin-backup-${digest([row.root, row.recoveryId])}.json` && /^[a-f0-9]{64}$/.test(row.backup.sha256) && natural(row.backup.bytes) && row.backup.bytes > 0, 'backup')
     const session = state.sessions.find(s => s.sessionId === row.owner)
-    requireThat(session?.interrupted && natural(row.revokedEpoch) && session.executionEpoch >= row.revokedEpoch && !state.locks.some(l => l.owner === row.owner), 'revoked owner')
+    requireThat(session && session.executionEpoch >= row.revokedEpoch, 'revoked owner epoch')
+    // The row-level invariants of an unsettled revocation bind only an owner
+    // still revoked at image time; a repaired owner's historical rows stand on
+    // their append-only bindings alone.
+    const stillRevoked = session.executionEpoch <= (finalRevokedEpoch.get(row.owner) ?? -1)
+    requireThat(!stillRevoked || (session.interrupted && !state.locks.some(l => l.owner === row.owner)), 'revoked owner')
     requireThat(Array.isArray(row.operations) && row.operations.length > 0, 'operations')
     const opIds = new Set()
     for (const item of row.operations) {
@@ -52,7 +81,14 @@ export function validateAdminLedger(state) {
       const op = state.operations.find(o => o.sessionId === row.owner && o.operationId === item.operationId)
       requireThat(op?.phase === 'unknown' && digest(op) === item.sha256, 'immutable operation binding')
     }
-    requireThat(state.operations.filter(o => o.sessionId === row.owner && (o.phase === 'unknown' || o.phase === 'publishing' || o.phase === 'prepared')).every(o => opIds.has(o.operationId)), 'complete unresolved owner scope')
+    // The row's responsibility is exactly the owner's unresolved operations
+    // originating at or before its revokedEpoch (that epoch never ran, so none
+    // originate AT it), excluding operations its earlier rows already cover.
+    const disposed = covered.get(row.owner) ?? new Set()
+    requireThat(state.operations.filter(o => o.sessionId === row.owner && (o.phase === 'unknown' || o.phase === 'publishing' || o.phase === 'prepared')
+      && (typeof o.origin?.executionEpoch !== 'number' || o.origin.executionEpoch <= row.revokedEpoch)
+      && !disposed.has(o.operationId)).every(o => opIds.has(o.operationId)), 'complete unresolved owner scope')
+    covered.set(row.owner, new Set([...disposed, ...opIds]))
     requireThat(row.confirmation === digest({ root: row.root, owner: row.owner, expectedRevision: row.expectedRevision, operationIds: [...opIds].sort(), risk: LATE_WRITER_RISK }), 'scoped confirmation')
     requireThat(Array.isArray(row.releasedLocks), 'released locks')
     const resources = new Set()

package/src/edit-lock/admin-recovery.js

@@ -6,7 +6,7 @@ import { createHash } from 'node:crypto'
 import { reservePublisher } from './reservation.js'
 import { openEditLockStore } from './store.js'
 import { canonical, parseSnapshot, validateImage } from './snapshot.js'
-import { administrativeState, digest, LATE_WRITER_RISK } from './admin-ledger.js'
+import { administrativeState, digest, dispositionFor, LATE_WRITER_RISK } from './admin-ledger.js'
 
 export const MAX_RECOVERY_BYTES = 16 * 1024 * 1024
 const sha256 = bytes => createHash('sha256').update(bytes).digest('hex')
@@ -101,7 +101,9 @@ export async function recoverAuthority(input, testing = {}) {
     if (before.revision !== input.expectedRevision) fail('revision-conflict', 'Authority revision changed; inspect and confirm again')
     const owner = before.state.sessions.find(s => s.sessionId === input.owner)
     if (!owner || !owner.interrupted) throw new Error('Only an interrupted historical owner can be overridden')
-    const unresolved = before.state.operations.filter(op => op.sessionId === input.owner && ['prepared', 'publishing', 'unknown'].includes(op.phase))
+    // Operations an earlier disposition of the same owner already covers stay
+    // disposed: a re-revocation after repair names only genuinely new unknowns.
+    const unresolved = before.state.operations.filter(op => op.sessionId === input.owner && ['prepared', 'publishing', 'unknown'].includes(op.phase) && !dispositionFor(before.state, op))
     check(unresolved.length > 0 && unresolved.every(op => op.phase === 'unknown'), 'Recover to stable unknown history before administrative override')
     check(canonical(unresolved.map(op => op.operationId).sort()) === canonical([...input.operationIds].sort()), 'Confirm every unresolved operation for this owner')
     const backup = { file: `admin-backup-${digest([input.root, input.recoveryId])}.json`, sha256: sha256(bytes), bytes: bytes.length }

package/src/edit-lock/domain.js

@@ -9,7 +9,8 @@ export function localDomain(lifecycle, endpoint) {
     service: lifecycle.service,
     /** @param {object} agent */
     start: agent => endpoint?.startLocal ? endpoint.startLocal(agent) : lifecycle.start(agent),
-    /** Trusted binding retry; never reopens permanently revoked authority. @param {object} agent */
+    /** Trusted binding retry; binds a revoked session as interrupted without
+     * restoring authority (the trusted resume path does that). @param {object} agent */
     retryStart: async agent => {
       lifecycle.assertStartable(agent)
       return endpoint?.startLocal ? endpoint.startLocal(agent, true) : lifecycle.start(agent)

package/src/edit-lock/index.js

@@ -258,7 +258,7 @@ function registerLockTools(ctx, service) {
       output: text('message'),
       async execute(/** @type {any} */ _args, /** @type {any} */ exec) {
         const unavailable = service.startupFailure(exec.agent)
-        if (unavailable) return { ...unavailable, message: `Edit Lock unavailable: ${unavailable.reason}. ${unavailable.bindingFailure?.retryable ? 'The user can run /edit-lock retry to retry the connection; this does not resume editing.' : 'Inspect Edit Lock maintenance before continuing.'}` }
+        if (unavailable) return { ...unavailable, message: `Edit Lock unavailable: ${unavailable.reason}. ${unavailable.bindingFailure?.retryable ? 'Do not retry failed edits: the binding is retried automatically when the user next sends a message, and /edit-lock retry also retries the connection; neither resumes editing by itself.' : 'Inspect Edit Lock maintenance before continuing.'}` }
         const locks = await service.locks(exec)
         const lines = locks.map((/** @type {any} */ lock) => `- ${lock.resourceId} owner=${lock.mine ? 'this session' : lock.owner} status=${lock.status} generation=${lock.generation}${lock.reason ? ` reason=${lock.reason}` : ''}`)
         // The reservation is part of what the holder needs to know: without it the
@@ -294,7 +294,7 @@ function replyToolDefinition(service) {
 /** @param {any} status */
 function describe(status) {
   const lines = [`Edit Lock session ${status.sessionId}: ${status.state}${status.interrupted ? ' (interrupted)' : ''}, epoch ${status.executionEpoch ?? '-'}`]
-  if (status.revoked) lines.push('Editing authority was permanently revoked by an administrative recovery; resume is impossible. Start a new conversation to edit this workspace.')
+  if (status.revoked) lines.push('Editing authority was revoked by an administrative recovery and its locks were released. Continue editing or send any message to restore editing in a new execution epoch; the revocation record is preserved.')
   for (const lock of status.locks) lines.push(`- ${lock.resourceId} [${lock.status}${lock.reason ? `: ${lock.reason}` : ''}] generation ${lock.generation}`)
   if (status.locks.length === 0) lines.push('- no locks held')
   const recovery = status.recovery
@@ -464,6 +464,13 @@ return (ctx, config = {}) => {
           recoveryId: info.record.recoveryId, revision: info.revision, idempotent: info.idempotent,
           operations: info.record.operations.length,
         }, { root }),
+        // Revocation repair audit: publisher-side, after the durable resume
+        // commit advanced the owner's epoch past its revokedEpoch. The ledger
+        // record itself never changes; the repair is a new-epoch event.
+        onRevocationRepair: info => audit(null, AUDIT_TYPES.editLockMaintenance, {
+          kind: 'revocation-repaired', root, owner: info.owner, trigger: info.trigger,
+          fromEpoch: info.fromEpoch ?? null, toEpoch: info.toEpoch,
+        }, { root })
       })
       let server
       try { server = await serveEditLockEndpoint(lifecycle, endpoint(directory), sinks, attestBinding,
@@ -513,7 +520,7 @@ return (ctx, config = {}) => {
     await setupInFlight.get(agent)
     if (settled.has(agent)) return settled.get(agent)
     const failure = startFailures.get(agent)
-    if (failure && bindingFailures.has(agent)) throw new Error(`Edit Lock binding is unavailable (${failure}). The user can run /edit-lock retry after the holder evidence changes. Retry connects only; do not replay the failed edit or remove a live publisher reservation.`)
+    if (failure && bindingFailures.has(agent)) throw new Error(`Edit Lock binding is unavailable (${failure}). Do not retry the failed edit: the binding is retried automatically when the user next sends a message, after which editing works normally. Never remove a live publisher reservation.`)
     if (failure) throw new Error(`this session has no Edit Lock domain: setup failed under the current preset generation (${failure}); the automatic re-bind was already attempted. Recovery: restart DeepSeek Harness or start a new conversation.`)
     // No fence match (foreign preset) or unmount: keep the stock refusal.
     return registry.forAgent(agent)
@@ -751,7 +758,7 @@ return (ctx, config = {}) => {
       startFailures.set(agent, reason)
       try { evidence?.recordSessionFailure?.(sessionOf(agent), reason) } catch { /* reporting only */ }
       audit(agent?.session ?? null, AUDIT_TYPES.editLockMaintenance, { kind: 'setup-failed', sessionId: sessionOf(agent) ?? null, reason })
-      try { deliverLocal(agent, `Edit Lock is unavailable for this session (${reason}); managed file editing is disabled. Recovery: restart DeepSeek Harness or start a new conversation.`) } catch { /* the audit record is the durable account */ }
+      try { deliverLocal(agent, `Edit Lock is unavailable for this session (${reason}); managed file editing is disabled and the failed edit must not be retried. This failure is not repaired automatically: the user can restart DeepSeek Harness or start a new conversation.`) } catch { /* the audit record is the durable account */ }
       ctx.logger?.warn?.(`edit lock scope failed; edit tools denied: ${reason}`)
       return
     }
@@ -783,7 +790,7 @@ return (ctx, config = {}) => {
       if (failure?.code === 'binding-duplicate') bindingFailures.set(agent, failure)
       else bindingFailures.delete(agent)
       try { evidence?.recordSessionFailure?.(sessionOf(agent), reason) } catch { /* reporting only */ }
-      try { deliverLocal(agent, `Edit Lock could not start this session's edit domain (${reason}); managed file editing is unavailable. ${failure?.code === 'binding-duplicate' ? 'Recovery: use /edit-lock retry after the original holder disconnects or its process shutdown is confirmed. Retry does not resume editing; never remove a live publisher reservation.' : 'Inspect Edit Lock maintenance before continuing.'}`) } catch { /* the panel record remains */ }
+      try { deliverLocal(agent, `Edit Lock could not start this session's edit domain (${reason}); managed file editing is temporarily unavailable. ${failure?.code === 'binding-duplicate' ? 'Do not retry the failed edit: the binding is retried automatically when the user next sends a message, after which editing works normally. Never remove a live publisher reservation.' : 'Inspect Edit Lock maintenance before continuing.'}`) } catch { /* the panel record remains */ }
       ctx.logger?.warn?.(`edit lock registration failed for ${sessionOf(agent)}: ${reason}`)
     }
   }
@@ -927,39 +934,65 @@ return (ctx, config = {}) => {
    * Boolean, consumed once by the next turn's first pre-step (message-driven
    * auto-resume D1/D6); WeakMap keys die with their agent. @type {WeakMap<object, boolean>} */
   const pendingAutoResume = new WeakMap()
+  /** A genuine user message also arms ONE bounded binding retry when this agent
+   * has a recorded duplicate-binding failure (message-driven self-heal, design
+   * D5): consumed at the next turn's first pre-step by awaiting the existing
+   * trusted retryBinding — same attestation guards, same in-flight join,
+   * fail-closed while a holder serves. @type {WeakMap<object, boolean>} */
+  const pendingBindingRetry = new WeakMap()
   /** @type {WeakSet<AbortSignal>} */
   const watched = new WeakSet()
   ctx.on('agent/pre-step', async (/** @type {any} */ event, /** @type {() => Promise<any>} */ next) => {
     const { agent, signal, turn } = event ?? {}
-    const domain = agent && settled.get(agent)
     // `pre-step` fires once per STEP, not per turn, so "a new turn started" has to
     // be detected on turn identity. Doing it on every step would clear the
-    // reservation a holder just asked for, one step later.
-    if (domain && turn && lastTurn.get(agent) !== turn) {
+    // reservation a holder just asked for, one step later. The detection runs
+    // even without a settled domain: a message-armed binding retry (D5) exists
+    // exactly while no domain is settled and must precede the turn's first step.
+    if (agent && turn && lastTurn.get(agent) !== turn) {
       lastTurn.set(agent, turn)
-      // A queued automatic-recovery summary (design D3) reaches exactly one
-      // agent as an ordinary mid-turn notice — the same proven delivery point
-      // as the settling and expiry notices.
-      const recoveryNotice = recoveryNotices.get(registry.rootOf(agent) ?? '')
-      if (recoveryNotice) {
-        recoveryNotices.delete(registry.rootOf(agent) ?? '')
-        try { deliverLocal(agent, recoveryNotice) } catch { /* the audit record is the durable account */ }
+      if (pendingBindingRetry.get(agent) === true) {
+        pendingBindingRetry.delete(agent)
+        const cause = bindingFailures.get(agent)
+        try {
+          await retryBinding(agent)
+          // The genuine message that armed this retry is also this turn's
+          // Continue receipt: re-arm what setupAgentOnce(retry) cleared, then
+          // fall through to the ordinary auto-resume consumption below.
+          pendingAutoResume.set(agent, true)
+          audit(agent?.session ?? null, AUDIT_TYPES.editLockMaintenance, {
+            kind: 'binding-auto-retry', sessionId: sessionOf(agent) ?? null,
+            code: cause?.code ?? 'binding-duplicate', result: 'recovered',
+          }, { root: registry.rootOf(agent) ?? undefined })
+        } catch { /* a safe refusal keeps the recorded cause; the turn proceeds with edits denied */ }
       }
-      // A genuine user message arrived while this session was stopped: resume
-      // it and confirm its retained files BEFORE the turn's first step, so the
-      // edits the turn is about to request are admitted (message-driven
-      // auto-resume D1). A failure only warns and the turn proceeds denied —
-      // the panel keeps showing the stopped state (D6).
-      if (pendingAutoResume.get(agent) === true) {
-        pendingAutoResume.delete(agent)
-        if (domain.blocks(agent)) await autoResume(domain, agent, message => ctx.logger?.warn?.(message))
+      const domain = settled.get(agent)
+      if (domain) {
+        // A queued automatic-recovery summary (design D3) reaches exactly one
+        // agent as an ordinary mid-turn notice — the same proven delivery point
+        // as the settling and expiry notices.
+        const recoveryNotice = recoveryNotices.get(registry.rootOf(agent) ?? '')
+        if (recoveryNotice) {
+          recoveryNotices.delete(registry.rootOf(agent) ?? '')
+          try { deliverLocal(agent, recoveryNotice) } catch { /* the audit record is the durable account */ }
+        }
+        // A genuine user message arrived while this session was stopped: resume
+        // it and confirm its retained files BEFORE the turn's first step, so the
+        // edits the turn is about to request are admitted (message-driven
+        // auto-resume D1). A failure only warns and the turn proceeds denied —
+        // the panel keeps showing the stopped state (D6).
+        if (pendingAutoResume.get(agent) === true) {
+          pendingAutoResume.delete(agent)
+          if (domain.blocks(agent)) await autoResume(domain, agent, message => ctx.logger?.warn?.(message))
+        }
+        // The holder is working again: every lock it holds leaves the holding state at
+        // once, without waiting for the reservation to run out (design D4), and the
+        // notice budget for this batch restarts.
+        settle.turnStarted(agent)
+        void Promise.resolve(domain.turnStarted(agent)).catch((/** @type {any} */ error) => ctx.logger?.warn?.(`edit lock turn start failed: ${error?.message ?? error}`))
       }
-      // The holder is working again: every lock it holds leaves the holding state at
-      // once, without waiting for the reservation to run out (design D4), and the
-      // notice budget for this batch restarts.
-      settle.turnStarted(agent)
-      void Promise.resolve(domain.turnStarted(agent)).catch((/** @type {any} */ error) => ctx.logger?.warn?.(`edit lock turn start failed: ${error?.message ?? error}`))
     }
+    const domain = agent && settled.get(agent)
     if (domain && signal && !watched.has(signal)) {
       watched.add(signal)
       const latch = () => { if (abortedByUser(signal)) domain.latch(agent) }
@@ -1004,6 +1037,11 @@ return (ctx, config = {}) => {
     }
     if (ctx.get?.('weirSettings')?.get?.('editLock')?.autoResume === false) return
     pendingAutoResume.set(agent, true)
+    // Message-driven binding self-heal (D5): the same genuine message arms ONE
+    // bounded retry of a recorded duplicate-binding failure, executed through
+    // the trusted retryBinding path at the next turn's first pre-step. Injected
+    // messages, timers, write calls and status reads never reach this branch.
+    if (bindingFailures.get(agent)?.code === 'binding-duplicate') pendingBindingRetry.set(agent, true)
   })
 
   // Classification and settling read only the durable turn/end reason

package/src/edit-lock/lifecycle.js

@@ -9,7 +9,7 @@ import { isMissingTarget, STALE_SWEEP_COOLDOWN_MS } from './stale-sweep.js'
  * Resume and confirm are trusted human ingress only; never expose them as tools.
  * @param {Awaited<ReturnType<typeof import('./runtime.js').openEditLockRuntime>>} runtime
  * @param {(agent: object) => string | undefined} sessionForAgent
- * @param {{deliver?: (agent: object, text: string, wake?: boolean) => void, onPending?: (agent: object, pending: number) => void, negotiationTimeoutMs?: number, onStaleRelease?: (row: {resourceId: string, owner: string, generation: number}, triggerSessionId: string | null) => void, onAdminRecovery?: (info: {revision: number, idempotent: boolean, record: any, trigger: string | null}) => void, warn?: (message: string) => void, sweepCooldownMs?: number, sweepNow?: () => number, servingRuntime?: (sessionId: string) => object | undefined}} [options] */
+ * @param {{deliver?: (agent: object, text: string, wake?: boolean) => void, onPending?: (agent: object, pending: number) => void, negotiationTimeoutMs?: number, onStaleRelease?: (row: {resourceId: string, owner: string, generation: number}, triggerSessionId: string | null) => void, onAdminRecovery?: (info: {revision: number, idempotent: boolean, record: any, trigger: string | null}) => void, onRevocationRepair?: (info: {owner: string, fromEpoch: number | undefined, toEpoch: number, trigger: string}) => void, warn?: (message: string) => void, sweepCooldownMs?: number, sweepNow?: () => number, servingRuntime?: (sessionId: string) => object | undefined}} [options] */
 export function createEditLockLifecycle(runtime, sessionForAgent, options = {}) {
   /** @typedef {{sessionId:string, state:'starting'|'active'|'recovering'|'stopped'|'resuming', attempt:number, ready:Promise<'active'|'interrupted'>, stop?:Promise<unknown>}} Entry */
   /** @type {Map<object, Entry>} */
@@ -169,13 +169,18 @@ export function createEditLockLifecycle(runtime, sessionForAgent, options = {})
     }
     return result
   }
-  /** Read-only startup admission; revoked owners remain terminal.
+  /** Read-only startup admission. A revoked session is startable: it binds as
+   * interrupted and its revocation ends only through the trusted resume path
+   * (the epoch advance is the repair; binding alone grants no authority).
    * @param {object} agent */
   function assertStartable(agent) {
     if (closed) throw new Error('edit lifecycle closed')
     const sessionId = sessionForAgent(agent)
     if (!sessionId) throw new Error('unregistered lifecycle agent')
-    if (sessionStatus(sessionId).session?.revoked) throw new Error('Edit Lock: this session was permanently revoked; binding retry cannot restore authority.')
+    // Health probe: a poisoned manager refuses the retry here, before any
+    // holder is touched. A revoked session passes — it binds as interrupted
+    // and only the trusted resume path ends the revocation.
+    sessionStatus(sessionId)
   }
   /** Register once before publishing an agent's editing tools. A session the
    * manager already knows (restart, re-created agent) is never re-armed: it
@@ -314,7 +319,12 @@ export function createEditLockLifecycle(runtime, sessionForAgent, options = {})
       const attempt = ++entry.attempt
       try {
         const { status, session } = sessionStatus(entry.sessionId)
-        if (session?.revoked) throw new Error('Edit Lock: editing authority in this session was permanently revoked by an administrative recovery and cannot be resumed. Start a new conversation to edit this workspace again.')
+        // A revoked session resumes exactly like a stopped one: the
+        // disposition already released its locks, so resume confirms the empty
+        // set and the epoch advance past revokedEpoch ends the revocation.
+        const wasRevoked = session?.revoked === true
+        const fromEpoch = session?.executionEpoch
+        if (!session?.interrupted) throw new Error('session is not durably interrupted')
         if (!session?.interrupted) throw new Error('session is not durably interrupted')
         const execution = {managerIncarnation: status.managerIncarnation, sessionId: entry.sessionId, executionEpoch: session.executionEpoch}
         const receipt = await runtime.control.issueExecutionReceipt(execution, requestId)
@@ -324,6 +334,12 @@ export function createEditLockLifecycle(runtime, sessionForAgent, options = {})
         }
         entry.state = 'active'
         host.attach(agent, resumed)
+        if (wasRevoked) {
+          // Repair of an administrative revocation is audited through the same
+          // shared channel as the recovery itself — never the session log.
+          const trigger = requestId.startsWith('auto:user-message:') ? 'auto' : 'manual'
+          try { options.onRevocationRepair?.({ owner: entry.sessionId, fromEpoch, toEpoch: resumed.executionEpoch, trigger }) } catch { /* audit is log-only */ }
+        }
         return statusOf(agent)
       } catch (error) {
         // Anything that may have resumed without attaching is revoked again.

package/src/edit-lock/manager.js

@@ -42,6 +42,9 @@ async function automaticSettlementRecords(previous, base, { liveness, root, proc
   const unknownByOwner = new Map()
   for (const operation of base.operations) {
     if (operation.phase !== 'unknown') continue
+    // An operation an earlier disposition already covers stays disposed; a
+    // re-revocation after repair binds only genuinely new unknowns.
+    if (dispositionFor(base, operation)) continue
     const ops = unknownByOwner.get(operation.sessionId) ?? []
     ops.push(operation)
     unknownByOwner.set(operation.sessionId, ops)
@@ -370,7 +373,8 @@ function managerCore(store, kernel, { processIdentity = null, root = null, write
       const captured = { ...execution }
       return transact(draft => {
         if (cancelled.has(captured.sessionId)) throw new Error('session cancelled')
-        checkNotRevoked(captured.sessionId)
+        // A revoked owner is NOT refused here: receipt issuance is half of the
+        // trusted repair path; the epoch binding still fences stale authority.
         return draft.authority.issueExecutionReceipt(captured, requestId)
       }, { kind: 'none' }).then(async receipt => {
         const cancellation = cancelled.get(captured.sessionId)
@@ -389,7 +393,8 @@ function managerCore(store, kernel, { processIdentity = null, root = null, write
       const captured = { ...execution }
       return transact(draft => {
         if (cancelled.has(captured.sessionId)) throw new Error('session cancelled')
-        checkNotRevoked(captured.sessionId)
+        // A revoked owner is NOT refused here: the resume commits the epoch
+        // advance that atomically ends the revocation (no ledger change).
         return draft.operations.resume(captured, requestId, receipt)
       }, () => sessionResources(captured.sessionId)).then(async resumed => {
         const cancellation = cancelled.get(captured.sessionId)
@@ -664,7 +669,7 @@ function managerCore(store, kernel, { processIdentity = null, root = null, write
         if (revokedOwner(state, input.owner)) refuse('invalid-recovery', 'owner already revoked by administrative recovery')
         const session = state.sessions.find((/** @type {any} */ row) => row.sessionId === input.owner)
         if (!session || !session.interrupted) refuse('invalid-recovery', 'Only an interrupted historical owner can be overridden')
-        const unresolved = state.operations.filter((/** @type {any} */ op) => op.sessionId === input.owner && ['prepared', 'publishing', 'unknown'].includes(op.phase))
+        const unresolved = state.operations.filter((/** @type {any} */ op) => op.sessionId === input.owner && ['prepared', 'publishing', 'unknown'].includes(op.phase) && !dispositionFor(state, op))
         if (!(unresolved.length > 0 && unresolved.every((/** @type {any} */ op) => op.phase === 'unknown'))) refuse('invalid-recovery', 'Recover to stable unknown history before administrative override')
         if (canonical(unresolved.map((/** @type {any} */ op) => op.operationId).sort()) !== canonical(scoped.operationIds)) refuse('invalid-recovery', 'Confirm every unresolved operation for this owner')
         const bytes = store.currentBytes()

package/src/edit-lock/view.js

@@ -63,8 +63,9 @@ export function buildView({ status, locks, recoveryState, cwd, root, mode, now }
     ? recoveryState.pausedUntil : null
   /** @type {typeof VIEW_STATES[number]} */
   let state
-  // Revoked wins over everything: administrative revocation is terminal and
-  // no action (resume, confirm, release) can ever apply to this session again.
+  // Revoked wins over everything: an administrative revocation is a distinct,
+  // durable fact the user must see. It is repairable, not terminal: the panel
+  // offers the same continue-editing path as for a stopped session.
   if (status.revoked === true) state = 'revoked'
   else if (status.state === 'stopped' || status.state === 'resuming') state = 'stopped'
   else if (status.state === 'recovering' || own.some(lock => lock.status === 'abnormal')) state = 'attention'
@@ -117,8 +118,10 @@ export function unavailableView(reason = null, bindingFailure = null) {
  * Cold-session view (design D2): map one validated authority image into the
  * same buildView input a live status read would produce, so a restored session
  * shows its TRUE recorded state — interrupted as stopped, an ADMIN OVERRIDE as
- * terminal revoked, its own locks and the domain's locks, retention settled
- * against the read instant — never a reasonless "starting". The `cold` marker
+ * repairable revoked (epoch-scoped: the owner is revoked only while its
+ * recorded epoch is within the disposition's revokedEpoch), its own locks and
+ * the domain's locks, retention settled against the read instant — never a
+ * reasonless "starting". The `cold` marker
  * tells the panel to replace live-only actions with activation guidance, and
  * the auto-resume gate travels with the view so the guidance matches the
  * committed setting. Pure like buildView: no IO, no clock, no ctx — the caller
@@ -141,7 +144,7 @@ export function buildColdView({ image, sessionId, cwd, root, autoResume = true,
   const session = sessions.find(row => row?.sessionId === sessionId) ?? null
   // The manager derives the revoked flag from the administrative ledger at
   // status time (revokedOwner); the cold read applies the same rule to the image.
-  const revoked = adminRecoveries.some(row => row?.owner === sessionId)
+  const revoked = session != null && adminRecoveries.some(row => row?.owner === sessionId && Number.isSafeInteger(row?.revokedEpoch) && session.executionEpoch <= row.revokedEpoch)
   // Read-time retention settlement, byte-equivalent to the kernel's settleHold:
   // a hold counts only while the session owns a lock, and the remaining budget
   // is computed against the read instant, so a missed expiry timer can never

package/src/settings/sections.js

@@ -49,7 +49,7 @@ const FIELDS = [
   { key: 'editLockHoldCumulativeMaxMinutes', section: 'editLock', field: 'holdCumulativeMaxMinutes', type: 'number', description: 'Edit Lock: cumulative retention minutes one batch of locks may use; asks beyond it are refused and only release remains (default 120)' },
   { key: 'editLockNudgeAttempts', section: 'editLock', field: 'nudgeAttempts', type: 'number', description: 'Edit Lock: how many times a finished turn is continued to ask for still-held locks to be released or retained (default 2)' },
   { key: 'editLockNudgeFallback', section: 'editLock', field: 'nudgeFallback', type: { union: ['release', 'abnormal'] }, description: 'Edit Lock: disposition of locks still held after those notices are used up; release frees the files for other sessions, abnormal keeps them for the user (default release)' },
-  { key: 'editLockAutoResume', section: 'editLock', field: 'autoResume', type: 'boolean', description: 'Edit Lock: a genuine user message automatically resumes a stopped session and confirms its retained files (default on)' },
+  { key: 'editLockAutoResume', section: 'editLock', field: 'autoResume', type: 'boolean', description: 'Edit Lock: a genuine user message automatically resumes a stopped or administratively revoked session and retries a duplicate-binding failure (default on)' },
   { key: 'editLockStaleSweep', section: 'editLock', field: 'staleSweep', type: 'boolean', description: 'Edit Lock: a genuine user message silently releases locks whose target file no longer exists (default on; read per message, applies immediately)' },
   { key: 'robashEnabled', section: 'robash', field: 'enabled', type: 'boolean', description: 'Guarded read-only bash for curated agents (master switch)' },
   { key: 'robashAllow', section: 'robash', field: 'allow', type: 'string', list: true, description: 'JSON array of command names to APPEND to the product-default bash allow list (empty adds nothing; the defaults are always in effect)' },