dsh-plugin-lookatstudy 0.14.0 → 0.14.1

package/lib/client.js

@@ -2210,6 +2210,7 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 				if (event === void 0) continue;
 				if (entry.type === "event") {
 					if (event.type === "user/message") {
+						if (event.data?.source?.kind !== "user") continue;
 						const text = userText(event);
 						if (text !== "") rows.push({
 							key: `u${event.seq}`,
@@ -2394,7 +2395,13 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 				run = [];
 			};
 			for (const line of text.split("\n")) {
-				const match = /^([A-D])[.、:)]\s+(.+)$/.exec(line.trim());
+				const plain = /^([A-D])[.、:)]\s*(.+)$/.exec(line.trim());
+				const table = /^\|\s*\*{0,2}([A-D])\*{0,2}\s*\|\s*(.+?)\s*\|$/.exec(line.trim());
+				const match = plain ?? (table !== null ? [
+					table[0],
+					table[1],
+					table[2].replaceAll("**", "").replaceAll("`", "")
+				] : null);
 				if (match === null) {
 					flush();
 					continue;
@@ -2475,6 +2482,17 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 		function titleMatches(title, query) {
 			return query.trim().toLowerCase().split(/\s+/).filter(Boolean).every((k) => title.toLowerCase().includes(k));
 		}
+		/**
+		* Whether the host session list actually knows a bound thread id. A restart
+		* can drop young sessions from persistence; an empty byId means the list has
+		* not hydrated yet (assume known — the send's own open surfaces a real error).
+		* Pure over the injected list snapshot.
+		*/
+		function sessionKnown(ctx, id) {
+			const byId = (ctx.sessions.list?.getSnapshot())?.byId;
+			if (byId === void 0) return true;
+			return Object.keys(byId).length === 0 ? true : id in byId;
+		}
 		/** One rendered chat row (shared shape with the read-aloud era's renderer). */
 		function chatRow(row, interactive) {
 			if (row.role === "user") return (0, react.createElement)("div", {
@@ -2520,6 +2538,7 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 			const [sendError, setSendError] = (0, react.useState)(null);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [rows, setRows] = (0, react.useState)([]);
+			const [feedAttached, setFeedAttached] = (0, react.useState)(false);
 			const [draft, setDraft] = (0, react.useState)("");
 			const lesson = data?.lesson ?? null;
 			const localBound = (0, react.useRef)(null);
@@ -2528,18 +2547,66 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 			(0, react.useEffect)(() => {
 				if (boundId === null) {
 					setRows([]);
+					setFeedAttached(false);
 					return;
 				}
-				const source = ctx.sessions.binding(boundId)?.eventSource;
-				if (source === void 0) {
-					setRows([]);
-					return;
+				setFeedAttached(false);
+				let disposed = false;
+				let offSource;
+				let offList;
+				const attach = () => {
+					const source = ctx.sessions.binding(boundId)?.eventSource;
+					if (source === void 0) return false;
+					const update = () => {
+						setRows(feedRows(source.getSnapshot()));
+					};
+					update();
+					setFeedAttached(true);
+					offSource = source.subscribe(update);
+					return true;
+				};
+				const stage = () => {
+					if (!sessionKnown(ctx, boundId)) return;
+					try {
+						const shell = PANEL_SHELL.current;
+						if (shell !== null) shell.suppressHandBack(() => {
+							ctx.sessions.open(boundId);
+						});
+						else ctx.sessions.open(boundId);
+					} catch {}
+				};
+				const reconcile = () => {
+					if (disposed || offSource !== void 0) return true;
+					if (ctx.sessions.list?.getSnapshot().current !== boundId) {
+						stage();
+						return false;
+					}
+					return attach();
+				};
+				if (!reconcile()) {
+					let tries = 0;
+					const timer = setInterval(() => {
+						if (disposed || offSource !== void 0 || reconcile() || ++tries >= 40) clearInterval(timer);
+					}, 150);
+					const list = ctx.sessions.list;
+					if (list !== void 0) offList = list.subscribe(() => {
+						if (disposed || reconcile()) {
+							offList?.();
+							offList = void 0;
+						}
+					});
+					return () => {
+						disposed = true;
+						clearInterval(timer);
+						offSource?.();
+						offList?.();
+					};
 				}
-				const update = () => {
-					setRows(feedRows(source.getSnapshot()));
+				return () => {
+					disposed = true;
+					offSource?.();
+					offList?.();
 				};
-				update();
-				return source.subscribe(update);
 			}, [boundId, ctx]);
 			(0, react.useEffect)(() => {
 				const el = streamEl.current;
@@ -2553,8 +2620,9 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 					setSendError(null);
 					try {
 						if (data?.active !== true) await activate(true);
-						let sessionId = localBound.current ?? data?.lessonSessions[lesson.lessonId];
-						if (sessionId === void 0 || sessionId === null) {
+						let sessionId = localBound.current ?? data?.lessonSessions[lesson.lessonId] ?? null;
+						if (sessionId !== null && !sessionKnown(ctx, sessionId)) sessionId = null;
+						if (sessionId === null) {
 							const area = await fetch("/lookatstudy/api/study-workspace");
 							if (!area.ok) throw new Error(`study area unavailable (HTTP ${String(area.status)})`);
 							const { path } = await area.json();
@@ -2595,6 +2663,8 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 				data,
 				lesson,
 				rows,
+				feedAttached,
+				bound: boundId !== null,
 				busy,
 				sendError,
 				draft,
@@ -2780,7 +2850,7 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 			}, tr("rail.empty.button"))), (0, react.createElement)("div", { className: "lks14-hint" }, tr("rail.empty.hint"), (0, react.createElement)("br"), tr("rail.empty.hint2")));
 		}
 		/** 中栏:the tutor chat stream with its own composer (upstream ChatStream + ChatComposer). */
-		function ChatPane({ data, lesson, rows, busy, sendError, draft, setDraft, send, setMode }) {
+		function ChatPane({ data, lesson, rows, feedAttached, bound, busy, sendError, draft, setDraft, send, setMode }) {
 			const streamEl = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				const el = streamEl.current;
@@ -2814,7 +2884,8 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 				}
 			}, tr(mode.labelKey))))), (0, react.createElement)("div", {
 				className: "lks14-stream",
-				ref: streamEl
+				ref: streamEl,
+				"data-lks-feed": rows.length > 0 ? `rows:${String(rows.length)}` : bound ? feedAttached ? "attached-empty" : "waiting" : "no-thread"
 			}, rows.length === 0 ? (0, react.createElement)("div", { className: "lks14-empty" }, dormant ? tr("tutor.dormant") : tr("tutor.empty"), (0, react.createElement)("br"), tr("tutor.empty.hint")) : rows.map((row, i) => chatRow(row, !dormant && i === lastAssistant ? { send } : void 0))), (0, react.createElement)("div", { className: "lks14-starters" }, ...starters.map((s) => (0, react.createElement)("button", {
 				key: s.label,
 				className: "lks14-starter",