dsh-plugin-lookatstudy 0.26.0 → 0.26.2

package/lib/client.js

@@ -1787,6 +1787,64 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			}));
 		}
 		//#endregion
+		//#region src/client/stage-session.ts
+		/** The plugin's private retention label (never the view owner's 'mainView'). */
+		const STAGE_SOURCE = "lookatstudy";
+		/** Which staging generation the host speaks ('retain' wins when both exist). */
+		function stagingMode(sessions) {
+			return typeof sessions.retain === "function" ? "retain" : "open";
+		}
+		let held = null;
+		/**
+		* Stage `sessionId` for observation + addressability.
+		* alpha: holds the plugin's reference. rc: `open()` navigation. Throws
+		* whatever the host face throws — callers keep their existing catch policy.
+		*/
+		function stageSession(sessions, sessionId) {
+			if (stagingMode(sessions) === "retain") {
+				if (held !== null && held.sessionId === sessionId) return;
+				const previous = held;
+				held = sessions.retain(sessionId, { source: STAGE_SOURCE });
+				previous?.release();
+			} else sessions.open?.(sessionId);
+		}
+		/** Release the held alpha reference (plugin dispose — across open/close
+		* toggles the reference stays held, mirroring rc's sticky current). */
+		function unstageSession() {
+			held?.release();
+			held = null;
+		}
+		/**
+		* Hold a TRANSIENT alpha reference for an effect's lifetime so scope/binding
+		* resolve for an un-staged session (E1/E6 projections, thread rename).
+		* rc: a no-op closer — listed ids are addressable there without help, and
+		* calling open() from inside an effect would trip the rc hand-back.
+		* alpha: undefined only when the retain is refused (treat as feature-absent).
+		*/
+		function acquireStageReference(sessions, sessionId) {
+			if (sessions.retain === void 0) return () => {};
+			let ref;
+			try {
+				ref = sessions.retain(sessionId, { source: STAGE_SOURCE });
+			} catch {
+				return;
+			}
+			return () => {
+				ref?.release();
+				ref = void 0;
+			};
+		}
+		/**
+		* Derive the host main-view selection from a list snapshot the way
+		* ui-workspace does: alpha removed `list.current`, and the view owner's
+		* `mainView` retention is the only public trace of the main selection.
+		* Pure; rc snapshots carry no `retainedBy` and read as no selection.
+		*/
+		function mainSelectionOf(byId) {
+			if (byId === void 0) return void 0;
+			for (const entry of Object.entries(byId)) if ((entry[1]?.retainedBy?.mainView ?? 0) > 0) return entry[0];
+		}
+		//#endregion
 		//#region src/client/data.ts
 		/**
 		* Shared client-side study store: one module-level poller over the host
@@ -8485,9 +8543,9 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 				}
 				const shell = PANEL_SHELL.current;
 				if (shell !== null) shell.suppressHandBack(() => {
-					ctx.sessions.open(sessionId);
+					stageSession(ctx.sessions, sessionId);
 				});
-				else ctx.sessions.open(sessionId);
+				else stageSession(ctx.sessions, sessionId);
 				const actx = ctx.sessions.scope(sessionId);
 				const face = actx === void 0 ? void 0 : ctx.sessions.sessionOf(actx);
 				if (face === void 0) throw new Error("import session is not addressable yet");
@@ -8530,6 +8588,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			(0, react.useEffect)(() => {
 				setPressure(null);
 				if (boundId === null) return;
+				const closeStage = acquireStageReference(ctx.sessions, boundId);
 				let disposed = false;
 				let off;
 				try {
@@ -8555,22 +8614,27 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 							}
 						};
 						read();
-						off = proj.subscribe(read);
+						off = proj.subscribe(() => {
+							queueMicrotask(read);
+						});
 						return () => {
 							disposed = true;
 							off?.();
+							closeStage?.();
 						};
 					}
 				} catch {}
 				return () => {
 					disposed = true;
 					off?.();
+					closeStage?.();
 				};
 			}, [boundId, ctx.sessions]);
 			const [modelFace, setModelFace] = (0, react.useState)(null);
 			(0, react.useEffect)(() => {
 				setModelFace(null);
 				if (boundId === null) return;
+				const closeStage = acquireStageReference(ctx.sessions, boundId);
 				let disposed = false;
 				let off;
 				try {
@@ -8582,16 +8646,20 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 							if (!disposed && snap !== void 0 && typeof snap === "object" && snap.next !== void 0 && snap.next !== null) setModelFace(snap.next);
 						};
 						read();
-						off = proj.subscribe(read);
+						off = proj.subscribe(() => {
+							queueMicrotask(read);
+						});
 						return () => {
 							disposed = true;
 							off?.();
+							closeStage?.();
 						};
 					}
 				} catch {}
 				return () => {
 					disposed = true;
 					off?.();
+					closeStage?.();
 				};
 			}, [boundId, ctx.sessions]);
 			(0, react.useEffect)(() => {
@@ -8620,7 +8688,9 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					};
 					update();
 					setFeedAttached(true);
-					offSource = source.subscribe(update);
+					offSource = source.subscribe(() => {
+						queueMicrotask(update);
+					});
 					return true;
 				};
 				const stage = () => {
@@ -8628,13 +8698,17 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					try {
 						const shell = PANEL_SHELL.current;
 						if (shell !== null) shell.suppressHandBack(() => {
-							ctx.sessions.open(boundId);
+							stageSession(ctx.sessions, boundId);
 						});
-						else ctx.sessions.open(boundId);
+						else stageSession(ctx.sessions, boundId);
 					} catch {}
 				};
 				const reconcile = () => {
 					if (disposed || offSource !== void 0) return true;
+					if (stagingMode(ctx.sessions) === "retain") {
+						stage();
+						return attach();
+					}
 					if (ctx.sessions.list?.getSnapshot().current !== boundId) {
 						stage();
 						return false;
@@ -8648,10 +8722,12 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					}, 150);
 					const list = ctx.sessions.list;
 					if (list !== void 0) offList = list.subscribe(() => {
-						if (disposed || reconcile()) {
-							offList?.();
-							offList = void 0;
-						}
+						queueMicrotask(() => {
+							if (disposed || reconcile()) {
+								offList?.();
+								offList = void 0;
+							}
+						});
 					});
 					return () => {
 						disposed = true;
@@ -8716,9 +8792,9 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 						}
 						const shell = PANEL_SHELL.current;
 						if (shell !== null) shell.suppressHandBack(() => {
-							ctx.sessions.open(sessionId);
+							stageSession(ctx.sessions, sessionId);
 						});
-						else ctx.sessions.open(sessionId);
+						else stageSession(ctx.sessions, sessionId);
 						const actx = ctx.sessions.scope(sessionId);
 						const face = actx === void 0 ? void 0 : ctx.sessions.sessionOf(actx);
 						if (face === void 0) throw new Error("lesson session is not addressable yet");
@@ -8758,9 +8834,9 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 				bindLessonSession(lesson.lessonId, sessionId);
 				const shell = PANEL_SHELL.current;
 				if (shell !== null) shell.suppressHandBack(() => {
-					ctx.sessions.open(sessionId);
+					stageSession(ctx.sessions, sessionId);
 				});
-				else ctx.sessions.open(sessionId);
+				else stageSession(ctx.sessions, sessionId);
 			};
 			const startNewThread = () => {
 				if (lesson === null) return;
@@ -8773,8 +8849,12 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			const renameLessonThreadUi = (sessionId, title) => {
 				if (lesson === null) return;
 				lessonThreadOp(lesson.lessonId, sessionId, "rename", { title }).then(() => {
+					const closeRef = acquireStageReference(ctx.sessions, sessionId);
+					if (closeRef === void 0) return;
 					const actx = ctx.sessions.scope(sessionId);
-					(actx === void 0 ? void 0 : ctx.sessions.sessionOf(actx))?.rename?.(title).catch(() => {});
+					(actx === void 0 ? void 0 : ctx.sessions.sessionOf(actx))?.rename?.(title).catch(() => {}).finally(() => {
+						closeRef();
+					});
 				}, (err) => {
 					setSendError(friendlyError(err, "action"));
 				});
@@ -11127,8 +11207,8 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 		* event.
 		*
 		* Differences from stardeck's original: our own attribute namespace, a
-		* hand-back SUPPRESSION hook (the panel itself calls sessions.open to stage
-		* the focus lesson's thread — an internal navigation must not close the
+		* hand-back SUPPRESSION hook (the panel itself stages the focus lesson's
+		* thread through stage-session.ts — an internal navigation must not close the
 		* panel; only USER session navigation hands the column back), and dsw-token
 		* styling via the injected stylesheet.
 		* @module dsh-plugin-lookatstudy/client/shell-entry
@@ -11287,13 +11367,21 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			doc.addEventListener(ACTIVATE_EVENT, onOtherActivate);
 			let unsubscribeSessions;
 			if (sessions?.list !== void 0) {
-				let lastCurrent = sessions.list.getSnapshot().current;
+				const readSelection = () => {
+					const snap = sessions.list.getSnapshot();
+					if (snap.current !== void 0) return snap.current;
+					return mainSelectionOf(snap.byId);
+				};
+				let lastCurrent = readSelection();
 				unsubscribeSessions = sessions.list.subscribe(() => {
-					const next = sessions.list.getSnapshot().current;
-					if (next === lastCurrent) return;
-					const wasHydration = lastCurrent === void 0;
-					lastCurrent = next;
-					if (shouldHandBack(suppressed, wasHydration)) state.setOpen(false);
+					const wasSuppressed = suppressed;
+					queueMicrotask(() => {
+						const next = readSelection();
+						if (next === lastCurrent) return;
+						const wasHydration = lastCurrent === void 0;
+						lastCurrent = next;
+						if (shouldHandBack(wasSuppressed, wasHydration)) state.setOpen(false);
+					});
 				});
 			}
 			const unsubscribe = state.subscribe(applyActive);
@@ -11318,6 +11406,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					doc.removeEventListener(ACTIVATE_EVENT, onOtherActivate);
 					unsubscribeSessions?.();
 					unsubscribe();
+					unstageSession();
 					root?.unmount();
 					container?.remove();
 					row.remove();