weir-harness 1.1.5 → 1.1.7

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.blackboard-model.js

@@ -13,8 +13,13 @@ window.__ModuleLoader__.load({
 		// /api/weirBlackboard/<method> payload shape.
 		//
 		// WIRE CONTRACT (pinned by src/blackboard/remote.js): namespace
-		// weirBlackboard, five methods, each taking the acting session as the
-		// `agentId` lookup parameter plus one JSON `args` object. The channel
+		// weirBlackboard. The seven board verbs each take the acting session as
+		// the `agentId` lookup parameter plus one JSON `args` object. The eighth
+		// method, resolve, is the deliberate exception: the browsing session id
+		// crosses as a BARE JSON `agentId` (no lookup, no scope, no inner args)
+		// because the gateway's agent lookup refuses subagent-owned sessions
+		// before the service can run — resolve is how a subagent session page
+		// learns the conversation root whose board it binds. The channel
 		// rides the RAW gateway carrier exactly like the capability reads (the
 		// hand-written src-json contribution cannot mount through
 		// ctx.remote.$mount — its strict-codec gate rejects src-json codecs),
@@ -99,6 +104,33 @@ window.__ModuleLoader__.load({
 			};
 		}
 
+		/**
+		 * The panel's root resolution (slice 4): POST weirBlackboard/resolve
+		 * with the browsing session id as a bare JSON `agentId` — NO inner
+		 * args object, NO agent lookup (the gateway's lookup would refuse a
+		 * subagent-owned session before the service runs). ok with a non-empty
+		 * value.sessionId folds to { ok: true, sessionId }; every other shape
+		 * (failure envelope, unusable payload, carrier throw) folds to
+		 * { ok: false, error } so the panel can fall back to the browsing id.
+		 */
+		function resolveBoardSession(rawCall, sessionId) {
+			let pending;
+			try {
+				pending = Promise.resolve(rawCall("weirBlackboard/resolve", { args: { agentId: sessionId } }));
+			} catch (cause) {
+				return Promise.resolve({ ok: false, error: { code: "call-threw", message: cause instanceof Error ? cause.message : String(cause) } });
+			}
+			return pending.then((result) => {
+				const folded = foldRemoteResult(result);
+				if (folded.ok === true) {
+					const root = folded.value?.sessionId;
+					if (typeof root === "string" && root !== "") return { ok: true, sessionId: root };
+					return { ok: false, error: { code: "bad-payload", message: "resolve returned no usable session id" } };
+				}
+				return { ok: false, error: folded.error };
+			}, (cause) => ({ ok: false, error: { code: "call-threw", message: cause instanceof Error ? cause.message : String(cause) } }));
+		}
+
 		// ---- entries ----
 
 		/** Defensive normalization of one wire row (list or read shape; content only present on reads). */
@@ -358,6 +390,7 @@ window.__ModuleLoader__.load({
 		exports.WATCH_GIVE_UP_AFTER = WATCH_GIVE_UP_AFTER;
 		exports.foldRemoteResult = foldRemoteResult;
 		exports.createBlackboardChannel = createBlackboardChannel;
+		exports.resolveBoardSession = resolveBoardSession;
 		exports.entryRowOf = entryRowOf;
 		exports.listOutcomeOf = listOutcomeOf;
 		exports.readOutcomeOf = readOutcomeOf;

package/lib/client.blackboard-panel.js

@@ -168,6 +168,13 @@ window.__ModuleLoader__.load({
 					minWidth: "16px",
 					textAlign: "center",
 					flex: "none"
+				},
+				parentNote: {
+					fontSize: "11px",
+					lineHeight: "16px",
+					color: MUTED,
+					flex: "none",
+					padding: "0 2px 4px"
 				}
 			},
 			row: {
@@ -481,20 +488,35 @@ window.__ModuleLoader__.load({
 			const [typeFilter, setTypeFilter] = react.useState("");
 			const [query, setQuery] = react.useState("");
 			const [promoting, setPromoting] = react.useState(false);
+			// The board the panel binds: null while resolveBoardSession runs, then
+			// the conversation root resolve names (a subagent session page cannot
+			// ride the gateway's agent lookup) or the browsing id itself when
+			// resolve fails — exactly the pre-resolve behavior.
+			const [boardSessionId, setBoardSessionId] = react.useState(null);
 			// Mirrors for async continuations (polls and call settles read the
 			// freshest state without stale-closure races).
 			const detailRef = react.useRef(null);
 			detailRef.current = detail;
 			const watchRef = react.useRef(null);
 			watchRef.current = watch;
-			const channel = react.useMemo(() => model.createBlackboardChannel(props.callBoard, props.sessionId), [props.callBoard, props.sessionId]);
-			const refreshList = () => channel.list().then((result) => {
-				setBoard(model.listOutcomeOf(result));
-			});
+			// The channel keys on the RESOLVED board session, never the browsing
+			// id: while resolution runs it does not exist, and every list/poll/
+			// detail effect below gates on it being non-null.
+			const channel = react.useMemo(
+				() => (boardSessionId === null ? null : model.createBlackboardChannel(props.callBoard, boardSessionId)),
+				[props.callBoard, boardSessionId],
+			);
+			const refreshList = () => {
+				if (channel === null) return Promise.resolve();
+				return channel.list().then((result) => {
+					setBoard(model.listOutcomeOf(result));
+				});
+			};
 			const setDetailFor = (key, next) => {
 				if (detailRef.current?.key === key) setDetail(next);
 			};
 			const loadDetail = (key) => {
+				if (channel === null) return;
 				// Record the request synchronously: a fast-settling read must not
 				// be dropped by the setDetailFor guard before the next render
 				// re-mirrors the ref.
@@ -514,14 +536,32 @@ window.__ModuleLoader__.load({
 				setRoute({ name: "detail", key });
 				loadDetail(key);
 			};
-			// Initial listing + session switch.
+			// Root resolution precedes the channel: a subagent session page cannot
+			// pass the gateway's agent lookup, so the panel first asks resolve for
+			// the conversation root and binds THAT board; a failed resolve keeps
+			// the browsing id (the pre-resolve behavior). While the answer is
+			// pending the board resets to the loading state; the alive flag drops
+			// a superseded answer after a session switch.
+			react.useEffect(() => {
+				let alive = true;
+				setBoardSessionId(null);
+				setBoard(null);
+				model.resolveBoardSession(props.callBoard, props.sessionId).then((result) => {
+					if (!alive) return;
+					setBoardSessionId(result.ok === true ? result.sessionId : props.sessionId);
+				});
+				return () => { alive = false; };
+			}, [props.callBoard, props.sessionId]);
+			// Initial listing + (re)bind: runs once the resolved channel exists
+			// and again whenever the answer swapped it.
 			react.useEffect(() => {
+				if (channel === null) return undefined;
 				let alive = true;
 				channel.list().then((result) => {
 					if (alive) setBoard(model.listOutcomeOf(result));
 				});
 				return () => { alive = false; };
-			}, [props.sessionId]);
+			}, [channel]);
 			// Page visibility: polls pause while hidden (no server push in this
 			// slice — the interval is the only refresh channel).
 			react.useEffect(() => {
@@ -531,15 +571,15 @@ window.__ModuleLoader__.load({
 				return () => document.removeEventListener("visibilitychange", onVisibility);
 			}, []);
 			react.useEffect(() => {
-				if (!visible || !(pollMs > 0)) return undefined;
+				if (!visible || !(pollMs > 0) || channel === null) return undefined;
 				const timer = setInterval(refreshList, pollMs);
 				return () => clearInterval(timer);
-			}, [visible, pollMs, props.sessionId]);
+			}, [visible, pollMs, channel]);
 			// The contention watch: poll apply until the key frees (an acquired
 			// flip means THIS session now holds the authority — the one-shot
 			// subscription's client-side half).
 			react.useEffect(() => {
-				if (!visible || watch?.phase !== "watching" || !(watchMs > 0)) return undefined;
+				if (!visible || watch?.phase !== "watching" || !(watchMs > 0) || channel === null) return undefined;
 				const timer = setInterval(() => {
 					channel.apply(watch.key).then((result) => {
 						const next = model.watchAfterPoll(watchRef.current, model.applyOutcomeOf(result));
@@ -587,6 +627,7 @@ window.__ModuleLoader__.load({
 				setRoute({ name: "editor", mode: "create" });
 			};
 			const startEdit = (entry) => {
+				if (channel === null) return;
 				if (entry.promoted) {
 					setNotice({ tone: "warn", text: t("blackboard.promotedReadonly", "This entry is promoted and read-only.") });
 					return;
@@ -611,6 +652,7 @@ window.__ModuleLoader__.load({
 			};
 			// ---- promotion request (3.1): the button pushes the evaluation brief into the main agent ----
 			const requestPromotionNow = () => {
+				if (channel === null) return;
 				if (promoting) return;
 				setNotice(null);
 				setPromoting(true);
@@ -626,6 +668,7 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const reacquire = () => {
+				if (channel === null) return;
 				if (editor?.mode !== "update") return;
 				const key = editor.key;
 				setEditor({ ...editor, phase: "applying", error: null, contended: null });
@@ -643,6 +686,7 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const saveEditor = () => {
+				if (channel === null) return;
 				if (editor === null || editor.draft === null || editor.phase === "saving" || editor.phase === "applying") return;
 				const errors = model.editorErrorsOf(editor.draft);
 				if (Object.keys(errors).length > 0) {
@@ -694,6 +738,7 @@ window.__ModuleLoader__.load({
 				writeNow();
 			};
 			const startDelete = (key) => {
+				if (channel === null) return;
 				setNotice(null);
 				setConfirmDelete({ key, phase: "applying", error: null });
 				channel.apply(key).then((result) => {
@@ -711,6 +756,7 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const confirmDeleteNow = () => {
+				if (channel === null) return;
 				if (confirmDelete?.phase !== "confirm") return;
 				const key = confirmDelete.key;
 				setConfirmDelete({ key, phase: "removing", error: null });
@@ -1181,6 +1227,11 @@ window.__ModuleLoader__.load({
 					]
 				})
 				: null;
+			// The parent-board note: the resolved root differs from the browsing
+			// session — this page is a subagent session showing its parent's board.
+			const parentBoardNote = route.name === "list" && boardSessionId !== null && boardSessionId !== props.sessionId
+				? react_jsx_runtime.jsx("div", { style: S.list.parentNote, children: t("blackboard.parentBoard", "Showing the parent conversation's board.") })
+				: null;
 			const scrollBody = route.name === "editor"
 				? react_jsx_runtime.jsx("div", { style: S.form.box, children: editorBody })
 				: route.name === "detail"
@@ -1189,6 +1240,7 @@ window.__ModuleLoader__.load({
 			return react_jsx_runtime.jsxs("div", { style: S.frame, children: [
 				header,
 				searchRow,
+				parentBoardNote,
 				scrollBody,
 				footerChips.length > 0 ? react_jsx_runtime.jsx("div", { style: S.footer.bar, children: footerChips }) : null
 			] });

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,