dsh-plugin-lookatstudy 0.22.2 → 0.23.0

package/lib/index.mjs

@@ -228,6 +228,13 @@ const ZH = {
 	"review.banner": "正在复习：{lesson}",
 	"review.threadTitle": "复习：{lesson}",
 	"threads.label": "课时线程",
+	"threads.scope": "跨课时连续对话",
+	"threads.scope.on": "已开启",
+	"threads.scope.off": "未开启",
+	"threads.coverage": "覆盖",
+	"ask.title": "导师想先确认一下",
+	"ask.free": "在下方输入框直接回复即可",
+	"ask.answered": "已回答",
 	"meter.label": "上下文用量",
 	"meter.aria": "上下文已用 {pct}%",
 	"meter.brk.system": "系统提示",
@@ -576,6 +583,13 @@ const EN = {
 	"palette.kind.action": "Action",
 	"palette.empty": "No matches",
 	"threads.label": "Lesson threads",
+	"threads.scope": "Continuous course thread",
+	"threads.scope.on": "on",
+	"threads.scope.off": "off",
+	"threads.coverage": "covers",
+	"ask.title": "The tutor wants a quick confirm",
+	"ask.free": "Answer in the composer below",
+	"ask.answered": "answered",
 	"threads.open": "{n} threads",
 	"threads.now": "current",
 	"threads.new": "New thread (your next message starts it)",
@@ -1482,6 +1496,23 @@ function computeStreakTransition(state, now = /* @__PURE__ */ new Date()) {
 	};
 }
 //#endregion
+//#region src/thread-key.ts
+/** Resolve the thread-group map key for a send from `lessonId`. Absent scope
+*  is legacy lesson behavior — old files never move. */
+function threadOwnerKey(scope, courseId, lessonId) {
+	return scope === "course" ? `course:${courseId}` : lessonId;
+}
+/** True when a thread-group key names a course-scoped group. Disambiguated
+*  by COLON COUNT, not by prefix alone: a course titled "Course" slugs to
+*  `course`, and its lesson keys (`course:0:0`) live inside the naive
+*  `course:` prefix space (caught live by the B7 trash test). Lesson ids are
+*  always `<slug>:<si>:<li>` — three segments, since slugs strip the colon —
+*  while a course key is exactly `course:<slug>`, two segments. */
+function isCourseOwnerKey(key) {
+	if (!key.startsWith("course:")) return false;
+	return !key.slice(7).includes(":");
+}
+//#endregion
 //#region src/state.ts
 /**
 * Learning state: courses → sections → lessons with mastery-driven gating,
@@ -1814,7 +1845,7 @@ function deleteCourse(state, courseId) {
 	const [course] = state.courses.splice(i, 1);
 	const prefix = `${courseId}:`;
 	const lessonThreads = [];
-	for (const key of Object.keys(state.lessonThreads)) if (key.startsWith(prefix)) {
+	for (const key of Object.keys(state.lessonThreads)) if (key.startsWith(prefix) || key === `course:${courseId}`) {
 		lessonThreads.push([key, state.lessonThreads[key]]);
 		delete state.lessonThreads[key];
 	}
@@ -1871,7 +1902,11 @@ function restoreCourse(state, courseId) {
 		}));
 		for (const p of entry.proposals) p.lessonId = remap(p.lessonId);
 		entry.artifacts = entry.artifacts.map(([k, v]) => [remap(k), v]);
-		entry.lessonThreads = entry.lessonThreads.map(([k, v]) => [remap(k), v]);
+		entry.lessonThreads = entry.lessonThreads.map(([k, v]) => {
+			if (!isCourseOwnerKey(k)) return [remap(k), v];
+			for (const t of v.threads) if (t.touchedLessons !== void 0) t.touchedLessons = t.touchedLessons.map(remap);
+			return [`course:${id}`, v];
+		});
 		entry.lessonSessions = entry.lessonSessions.map(([k, v]) => [remap(k), v]);
 		if (entry.focusLessonId !== null) entry.focusLessonId = remap(entry.focusLessonId);
 	}
@@ -2303,25 +2338,67 @@ function recordAnswer(state, lessonId, correct, concept, now) {
 * @returns completion result including the unlocked lessons.
 */
 /**
+* Set a course's thread granularity (0.23.0). Switching never touches the
+* sediment: both sides' groups stay put and are resumed when the scope flips
+* back. Unknown ids fail loud.
+*/
+function setCourseThreadScope(state, courseId, scope) {
+	const course = state.courses.find((c) => c.id === courseId);
+	if (course === void 0) throw new Error(`lookatstudy-plugin: unknown course id ${JSON.stringify(courseId)}`);
+	course.threadScope = scope;
+}
+/**
+* Resolve the thread-group map key a send from `lessonId` belongs to — the
+* 0.23.0 granularity funnel: lesson scope keeps legacy lessonId keys, course
+* scope namespaces the course. Every thread-group access in this module goes
+* through here (or through an ownerKey already derived from it).
+*/
+function ownerKeyFor(state, lessonId) {
+	const ref = findLesson(state, lessonId);
+	const scope = ref.course.threadScope === "course" ? "course" : "lesson";
+	return {
+		key: threadOwnerKey(scope, ref.course.id, lessonId),
+		scope
+	};
+}
+/**
+* Under course scope, mirrors drift per lesson (each remembers the last
+* thread IT used) — drift onto a LIVE thread is fine. The moment a thread
+* leaves the live set (archived, deleted, or rolled off the active pointer),
+* every mirror still naming it is a dead reference — re-point them at the
+* group's current active thread (or drop them when none is left). Lesson
+* scope keeps the legacy exact-mirror behavior at its own key.
+*/
+function repointMirrorsOff(state, key, threadId, group) {
+	if (threadId === null || !isCourseOwnerKey(key)) return;
+	for (const lessonId of Object.keys(state.lessonSessions)) if (state.lessonSessions[lessonId] === threadId) {
+		if (group.active === null) delete state.lessonSessions[lessonId];
+		else state.lessonSessions[lessonId] = group.active;
+	}
+}
+/**
 * Bind a dsh session into a lesson's thread group (the issue-#11 write, the
 * upstream sendMessage/ensureThreadForSend translation): an UNKNOWN session id
 * appends a new thread (titled by the caller — the first message's text or a
 * short action label) and becomes active; a KNOWN id re-activates it (bumping
 * lastAt); `null` clears the active pointer (the ＋新建 affordance — the next
 * send mints a fresh thread). The legacy lessonSessions map stays in lockstep
-* with the active pointer so pre-0.22 readers never disagree.
+* with the active pointer so pre-0.22 readers never disagree. Under course
+* scope (0.23.0) the group is the course's, the send-from lesson joins the
+* thread's touchedLessons coverage, and mirrors sync per
+* {@link repointRolledMirrors}.
 */
 function bindLessonThread(state, lessonId, sessionId, title) {
-	findLesson(state, lessonId);
+	const { key, scope } = ownerKeyFor(state, lessonId);
 	state.lessonThreads ??= {};
-	const group = state.lessonThreads[lessonId] ?? {
+	const group = state.lessonThreads[key] ?? {
 		active: null,
 		threads: []
 	};
 	if (sessionId === null) {
 		group.active = null;
-		state.lessonThreads[lessonId] = group;
-		delete state.lessonSessions[lessonId];
+		state.lessonThreads[key] = group;
+		if (scope === "lesson") delete state.lessonSessions[lessonId];
 		return group;
 	}
 	const existing = group.threads.find((t) => t.id === sessionId);
@@ -2331,31 +2408,37 @@ function bindLessonThread(state, lessonId, sessionId, title) {
 			id: sessionId,
 			title: (title ?? "").trim() !== "" ? title.trim() : lessonId,
 			createdAt: now,
-			lastAt: now
+			lastAt: now,
+			touchedLessons: [lessonId]
 		});
 	} else {
 		existing.lastAt = (/* @__PURE__ */ new Date()).toISOString();
 		if (existing.status === "archived") existing.status = "active";
+		const touched = existing.touchedLessons ??= [];
+		if (!touched.includes(lessonId)) touched.push(lessonId);
 	}
 	group.active = sessionId;
-	state.lessonThreads[lessonId] = group;
+	state.lessonThreads[key] = group;
 	state.lessonSessions[lessonId] = sessionId;
 	return group;
 }
 /** Roll the group's active pointer to the freshest ACTIVE thread (or null)
 *  and keep the legacy lessonSessions mirror in lockstep. Shared by the
 *  archive/delete operations when they take out the current thread. */
-function rollActiveToFresh(state, lessonId, group) {
+function rollActiveToFresh(state, key, group) {
+	const prev = group.active;
 	const live = group.threads.filter((t) => t.status !== "archived");
 	group.active = live.length > 0 ? live.reduce((a, b) => a.lastAt > b.lastAt ? a : b).id : null;
-	if (group.active !== null) state.lessonSessions[lessonId] = group.active;
-	else delete state.lessonSessions[lessonId];
+	if (isCourseOwnerKey(key)) repointMirrorsOff(state, key, prev, group);
+	else if (group.active !== null) state.lessonSessions[key] = group.active;
+	else delete state.lessonSessions[key];
 }
 /** Rename a thread's stored title (issue #11 management: upstream gear menu).
 *  The dsh session's own title is renamed host-side by the client (best
 *  effort) — this is the durable plugin-side half. Throws on unknown ids. */
 function renameLessonThread(state, lessonId, sessionId, title) {
-	const group = state.lessonThreads?.[lessonId];
+	const key = ownerKeyFor(state, lessonId).key;
+	const group = state.lessonThreads?.[key];
 	if (group === void 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread group`);
 	const thread = group.threads.find((t) => t.id === sessionId);
 	if (thread === void 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread ${JSON.stringify(sessionId)}`);
@@ -2368,12 +2451,14 @@ function renameLessonThread(state, lessonId, sessionId, title) {
 *  threads leave the switcher list entirely (no unarchive entry there; the
 *  state API keeps `archived: false` for symmetry/future UI). */
 function archiveLessonThread(state, lessonId, sessionId, archived) {
-	const group = state.lessonThreads?.[lessonId];
+	const key = ownerKeyFor(state, lessonId).key;
+	const group = state.lessonThreads?.[key];
 	if (group === void 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread group`);
 	const thread = group.threads.find((t) => t.id === sessionId);
 	if (thread === void 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread ${JSON.stringify(sessionId)}`);
 	thread.status = archived ? "archived" : "active";
-	if (archived && group.active === sessionId) rollActiveToFresh(state, lessonId, group);
+	if (archived && group.active === sessionId) rollActiveToFresh(state, key, group);
+	if (archived) repointMirrorsOff(state, key, sessionId, group);
 	if (!archived && group.active === null) {
 		group.active = sessionId;
 		state.lessonSessions[lessonId] = sessionId;
@@ -2385,12 +2470,14 @@ function archiveLessonThread(state, lessonId, sessionId, archived) {
 *  the host session face (no delete primitive) — it stays in the host's session
 *  list; the UI discloses this. Throws on unknown ids. */
 function deleteLessonThread(state, lessonId, sessionId) {
-	const group = state.lessonThreads?.[lessonId];
+	const key = ownerKeyFor(state, lessonId).key;
+	const group = state.lessonThreads?.[key];
 	if (group === void 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread group`);
 	const idx = group.threads.findIndex((t) => t.id === sessionId);
 	if (idx < 0) throw new Error(`lookatstudy-plugin: lesson ${JSON.stringify(lessonId)} has no thread ${JSON.stringify(sessionId)}`);
 	group.threads.splice(idx, 1);
-	if (group.active === sessionId) rollActiveToFresh(state, lessonId, group);
+	if (group.active === sessionId) rollActiveToFresh(state, key, group);
+	repointMirrorsOff(state, key, sessionId, group);
 	return group;
 }
 function completeLesson(state, lessonId, now) {
@@ -2965,6 +3052,7 @@ function workbenchState(state, now) {
 		return {
 			courseId: course.id,
 			title: course.title,
+			threadScope: course.threadScope === "course" ? "course" : "lesson",
 			mastered: lessons.filter((l) => l.status === "mastered").length,
 			total: lessons.length,
 			avgMasteryPct: answered.length === 0 ? null : Math.round(answered.reduce((sum, l) => sum + (l.mastery ?? 0), 0) / answered.length * 100),
@@ -3662,6 +3750,7 @@ function registerDashboard(webServer, deps) {
 					return;
 				}
 				const state = deps.store.get();
+				let group = null;
 				try {
 					if (body.op === "rename") {
 						if (typeof body.title !== "string" || body.title.trim() === "") {
@@ -3671,7 +3760,7 @@ function registerDashboard(webServer, deps) {
 							});
 							return;
 						}
-						renameLessonThread(state, body.lessonId, body.sessionId, body.title);
+						group = renameLessonThread(state, body.lessonId, body.sessionId, body.title);
 					} else if (body.op === "archive") {
 						if (typeof body.archived !== "boolean") {
 							sendJson(res, 400, {
@@ -3680,8 +3769,8 @@ function registerDashboard(webServer, deps) {
 							});
 							return;
 						}
-						archiveLessonThread(state, body.lessonId, body.sessionId, body.archived);
-					} else deleteLessonThread(state, body.lessonId, body.sessionId);
+						group = archiveLessonThread(state, body.lessonId, body.sessionId, body.archived);
+					} else group = deleteLessonThread(state, body.lessonId, body.sessionId);
 				} catch (error) {
 					sendJson(res, 404, {
 						ok: false,
@@ -3690,7 +3779,6 @@ function registerDashboard(webServer, deps) {
 					return;
 				}
 				deps.store.save();
-				const group = state.lessonThreads[body.lessonId];
 				sendJson(res, 200, {
 					ok: true,
 					active: group?.active ?? null,
@@ -3698,6 +3786,32 @@ function registerDashboard(webServer, deps) {
 				});
 				return;
 			}
+			if (req.method === "POST" && pathname === "/lookatstudy/api/course-scope") {
+				const body = await readJsonBodySafe(req, res);
+				if (body === void 0) return;
+				if (typeof body.courseId !== "string" || body.scope !== "lesson" && body.scope !== "course") {
+					sendJson(res, 400, {
+						ok: false,
+						error: "courseId and scope (lesson|course) required"
+					});
+					return;
+				}
+				try {
+					setCourseThreadScope(deps.store.get(), body.courseId, body.scope);
+				} catch (error) {
+					sendJson(res, 404, {
+						ok: false,
+						error: error instanceof Error ? error.message : String(error)
+					});
+					return;
+				}
+				deps.store.save();
+				sendJson(res, 200, {
+					ok: true,
+					scope: body.scope
+				});
+				return;
+			}
 			if (req.method === "GET" && pathname === "/lookatstudy/api/course-pack") {
 				const courseId = new URL(req.url ?? "/", "http://x").searchParams.get("courseId") ?? "";
 				const course = findCourseForPack(deps.store.get(), courseId);
@@ -10144,6 +10258,26 @@ function snapshotSectionText(state) {
 	if (snap.dueCount > 0) lines.push(`今日待复习: ${snap.dueCount} 项`);
 	if (snap.pendingProposal !== null) lines.push(`待决提案 ${snap.pendingProposal.id}: ${sanitizePromptText(snap.pendingProposal.rationale, 160)}(等学习者表态)`);
 	const focusCourse = state.courses.find((c) => c.id === snap.focus?.courseId);
+	if (focusCourse?.threadScope === "course" && snap.focus !== null) {
+		const group = state.lessonThreads[threadOwnerKey("course", focusCourse.id, snap.focus.lessonId)];
+		const touched = group?.threads.find((t) => t.id === group.active)?.touchedLessons;
+		const titleOf = /* @__PURE__ */ new Map();
+		for (const sec of focusCourse.sections) for (const l of sec.lessons) titleOf.set(l.id, l.title);
+		const digest = focusCourse.sections.flatMap((sec) => sec.lessons.filter((l) => l.kind !== "exam")).slice(0, 60).map((l) => {
+			const pct = l.mastery === null ? "" : ` ${String(Math.round(l.mastery * 100))}%`;
+			const weak = (conceptViews(l) ?? []).some((c) => c.weak) ? " ⚡薄弱" : "";
+			const fric = l.friction.length > 0 ? ` ⚑卡点${String(l.friction.length)}` : "";
+			return `- ${sanitizePromptText(l.title)}[${String(l.status)}${pct}]${weak}${fric}`;
+		});
+		lines.push("");
+		lines.push("【本课程进度摘要】(跨课时连续对话:本线跨课时延续,换课时不改线)");
+		lines.push(...digest);
+		if (touched !== void 0 && touched.length > 0) {
+			const names = touched.map((id) => sanitizePromptText(titleOf.get(id) ?? id)).join(" · ");
+			lines.push(`本对话线已覆盖课时: ${names}; 当前焦点: ${sanitizePromptText(snap.focus.lessonTitle)}`);
+		}
+		lines.push("出跨课时综合题前,先调用 study_lesson 调出相关课时正文再命题——组合题优先利用本线已有的跨课时现场。");
+	}
 	if (focusCourse?.languageTarget != null && focusCourse.languageTarget !== "") {
 		const t = localeToLanguageName(focusCourse.languageTarget);
 		lines.push("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-lookatstudy",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "packageManager": "pnpm@11.7.0",
   "description": "Turn any markdown, local folder, or GitHub learning repo into a guided course inside DeepSeek Harness: gated skill-tree progression, BKT mastery tracking, SM-2 spaced repetition.",
   "type": "module",