dsh-plugin-lookatstudy 0.21.0 → 0.21.1

package/lib/index.mjs

@@ -229,6 +229,7 @@ const ZH = {
 	"settings.budget.on": "开启历史预算",
 	"settings.budget.off": "关闭历史预算",
 	"attach.sent": "我发了一个文件:{name}(工作区路径 {path})——请读取它再继续。",
+	"attach.remove": "移除待发附件",
 	"attach.fail": "附件上传失败",
 	"attach.label": "附件(≤20MiB,存入学习工作区)",
 	"rail.mastered": "毕业 {mastered}/{total} 课",
@@ -575,6 +576,7 @@ const EN = {
 	"settings.budget.on": "Enable history budget",
 	"settings.budget.off": "Disable history budget",
 	"attach.sent": "I attached a file: {name} (workspace path {path}) — read it before continuing.",
+	"attach.remove": "Remove pending attachment",
 	"attach.fail": "Attachment upload failed",
 	"attach.label": "Attach (≤20MiB, lands in the study workspace)",
 	"rail.mastered": "{mastered}/{total} lessons graduated",
@@ -778,10 +780,13 @@ function escapeHtml(text) {
 }
 /** Render inline markup (code, bold, italic, links, images) over escaped text.
 * Image src allowlist: https?:// or data:image/ — folder imports inline local
-* images as data URLs (capped), GitHub imports reference jsDelivr; anything
-* else stays literal text (no broken relative images, no exotic schemes). */
+* images as data URLs (capped), GitHub imports reference jsDelivr; the
+* plugin's own attachment route (/lookatstudy/api/attachment/<name>, issue #7
+* — same-origin, server-side validated) renders workspace attachments;
+* anything else stays literal text (no broken relative images, no exotic
+* schemes). */
 function inline(escaped) {
-	return escaped.replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/\*([^*]+)\*/g, "<em>$1</em>").replace(/!\[([^\]]*)\]\((https?:\/\/[^)\s]+|data:image\/[^)\s]+)\)/g, (_m, alt, src) => `<img src="${src}" alt="${alt}" loading="lazy">`).replace(/\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g, "<a href=\"$2\" target=\"_blank\" rel=\"noreferrer\">$1</a>");
+	return escaped.replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/\*([^*]+)\*/g, "<em>$1</em>").replace(/!\[([^\]]*)\]\((https?:\/\/[^)\s]+|data:image\/[^)\s]+|\/lookatstudy\/api\/attachment\/[^)\s]+)\)/g, (_m, alt, src) => `<img src="${src}" alt="${alt}" loading="lazy">`).replace(/\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g, "<a href=\"$2\" target=\"_blank\" rel=\"noreferrer\">$1</a>");
 }
 /** Interleave one body with its translation, paragraph by paragraph (upstream
 * translation-layout "microsoft" semantics: original paragraph then its
@@ -1496,9 +1501,11 @@ function freshLesson(title, anchor, body, kind = "study") {
 * @returns the imported (or pre-existing) course.
 */
 function importCourse(state, parsed, source, sourceRef, languageTarget) {
-	const id = slugify(parsed.title);
-	const existing = state.courses.find((c) => c.id === id);
-	if (existing) return existing;
+	const base = slugify(parsed.title);
+	const sameTitle = state.courses.find((c) => c.id === base && c.title === parsed.title);
+	if (sameTitle !== void 0) return sameTitle;
+	let id = base;
+	for (let n = 2; state.courses.some((c) => c.id === id); n++) id = `${base}-${String(n)}`;
 	const course = {
 		id,
 		title: parsed.title,
@@ -3188,6 +3195,36 @@ function registerDashboard(webServer, deps) {
 				}
 				return;
 			}
+			if (req.method === "GET" && pathname.startsWith("/lookatstudy/api/attachment/")) {
+				let name = "";
+				try {
+					name = decodeURIComponent(pathname.slice(28));
+				} catch {
+					name = "";
+				}
+				if (name === "" || name.includes("..") || /[\\/]/.test(name) || name.length > 250) {
+					sendJson(res, 404, {
+						ok: false,
+						error: "not found"
+					});
+					return;
+				}
+				try {
+					const buf = readFileSync(join(deps.studyAreaPath, "attachments", name));
+					const ext = name.slice(name.lastIndexOf(".") + 1).toLowerCase();
+					const mime = ext === "png" ? "image/png" : ext === "jpg" || ext === "jpeg" ? "image/jpeg" : ext === "gif" ? "image/gif" : ext === "webp" ? "image/webp" : ext === "bmp" ? "image/bmp" : "application/octet-stream";
+					res.writeHead(200, {
+						"content-type": mime,
+						"cache-control": "public, max-age=31536000, immutable"
+					}).end(buf);
+				} catch {
+					sendJson(res, 404, {
+						ok: false,
+						error: "not found"
+					});
+				}
+				return;
+			}
 			sendJson(res, 404, {
 				ok: false,
 				error: "not found"
@@ -6223,6 +6260,11 @@ function studyTools(store, deps = {}) {
 						type: "integer",
 						required: true
 					},
+					created: {
+						type: "boolean",
+						required: true,
+						description: "False when an existing course short-circuited the import (same title) — the design did NOT land as a new course."
+					},
 					languageTarget: {
 						type: "string",
 						description: "Present only when the course teaches a language itself (BCP-47); the tutor then keeps quiz material in the target language."
@@ -6231,7 +6273,7 @@ function studyTools(store, deps = {}) {
 			},
 			render: (_args, value) => [{
 				type: "text",
-				text: `Imported designed course “${value.title}” (${value.sections} sections, ${value.lessons} lessons${value.droppedLessons > 0 ? `, ${value.droppedLessons} hallucinated lesson(s) dropped` : ""})${typeof value.languageTarget === "string" ? ` — language course (${value.languageTarget}): keep reading passages, example sentences, and quiz language material in the target language` : ""}. First lesson: “${value.firstLessonTitle}” (id ${value.firstLessonId}). Present the course map to the learner.`
+				text: value.created === false ? `“${value.title}” (id ${value.courseId}) was ALREADY imported — the design did not create a new course. Continue with the existing course, or delete it first (study_delete_course) to rebuild from this design.` : `Imported designed course “${value.title}” (${value.sections} sections, ${value.lessons} lessons${value.droppedLessons > 0 ? `, ${value.droppedLessons} hallucinated lesson(s) dropped` : ""})${typeof value.languageTarget === "string" ? ` — language course (${value.languageTarget}): keep reading passages, example sentences, and quiz language material in the target language` : ""}. First lesson: “${value.firstLessonTitle}” (id ${value.firstLessonId}). Present the course map to the learner.`
 			}]
 		},
 		async execute(args, exec) {
@@ -6261,7 +6303,13 @@ function studyTools(store, deps = {}) {
 			const parsed = buildCourseFromDesign(pd.part !== void 0 && pd.partCount !== void 0 && pd.partCount > 1 ? `${pd.courseTitle} (part ${pd.part})` : pd.courseTitle, validated, contents, pd.translations);
 			requireParsedLessons(parsed);
 			const languageTarget = typeof args.languageTarget === "string" && args.languageTarget.trim() !== "" ? args.languageTarget.trim().slice(0, 35) : null;
-			const value = mutate((state) => toImportValue(importCourse(state, parsed, pd.source, pd.url, languageTarget)));
+			const value = mutate((state) => {
+				const before = state.courses.length;
+				return {
+					...toImportValue(importCourse(state, parsed, pd.source, pd.url, languageTarget)),
+					created: state.courses.length > before
+				};
+			});
 			pendingDesign = null;
 			pendingPart = 1;
 			return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-lookatstudy",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "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",