dsh-plugin-lookatstudy 0.20.1 → 0.21.1

package/lib/index.mjs

@@ -201,6 +201,9 @@ const ZH = {
 	"note.retryRender": "重试渲染",
 	"zoom.in": "放大面板字号",
 	"zoom.out": "缩小面板字号",
+	"pane.rail.aria": "调整课程栏宽度",
+	"pane.chat.aria": "调整对话栏宽度",
+	"pane.tip": "拖拽调宽,双击重置",
 	"palette.label": "命令面板",
 	"palette.placeholder": "搜索课时/课程,或选择动作…",
 	"palette.lessons": "课时",
@@ -226,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} 课",
@@ -544,6 +548,9 @@ const EN = {
 	"note.retryRender": "Retry render",
 	"zoom.in": "Increase panel font size",
 	"zoom.out": "Decrease panel font size",
+	"pane.rail.aria": "Resize the course pane width",
+	"pane.chat.aria": "Resize the chat pane width",
+	"pane.tip": "Drag to resize, double-click to reset",
 	"palette.label": "Command palette",
 	"palette.placeholder": "Search lessons/courses or pick an action…",
 	"palette.lessons": "Lesson",
@@ -569,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",
@@ -772,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
@@ -1485,18 +1496,23 @@ function freshLesson(title, anchor, body, kind = "study") {
 * @param parsed - course tree from an importer.
 * @param source - import origin.
 * @param sourceRef - markdown/folder/repo reference for display.
+* @param languageTarget - the taught language (BCP-47) when the course IS a
+*  language course (design-apply path only; markdown imports stay undefined).
 * @returns the imported (or pre-existing) course.
 */
-function importCourse(state, parsed, source, sourceRef) {
-	const id = slugify(parsed.title);
-	const existing = state.courses.find((c) => c.id === id);
-	if (existing) return existing;
+function importCourse(state, parsed, source, sourceRef, languageTarget) {
+	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,
 		source,
 		sourceRef,
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+		languageTarget: languageTarget ?? null,
 		sections: parsed.sections.map((section) => {
 			const lessons = section.lessons.map((lesson) => (() => {
 				const st = freshLesson(lesson.title, lesson.anchor, lesson.body, lesson.world === "practice" ? "practice" : "study");
@@ -3179,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"
@@ -5045,8 +5091,13 @@ function renderDesignBrief(pending, part = 1) {
 	lines.push("- if the directory layout is already clear (e.g. lessons/N-Topic/), keep its sections; do not over-reorganize.");
 	lines.push(`- anchor is the full heading text used to slice the body; omit it for whole-file lessons.${shown.length > 80 ? " This part is large: design at file granularity (omit anchors, one lesson per file) to keep the JSON manageable." : ""}`);
 	lines.push("");
+	lines.push("### Language-course check (decide while designing)");
+	lines.push("Is this course teaching a language ITSELF (vocabulary, grammar, reading/writing/listening of English/Japanese/Korean/Chinese/…), rather than a knowledge/tech course that merely happens to be written in some language? Typical tells: vocab lists, grammar-point explanations, dialogues/readings, sentence-translation pairs, level markers (N5/N1, TOEFL/IELTS, HSK, JLPT), pronunciation content.");
+	lines.push("- Yes → add \"languageTarget\": \"<BCP-47 of the TAUGHT language>\" (teaching English → \"en\", Japanese → \"ja\"). The writing language is NOT the taught language — a Chinese-written English-textbook repo has languageTarget \"en\".");
+	lines.push("- No, or unsure → omit it entirely (a normal course misflagged as a language course is worse than the reverse).");
+	lines.push("");
 	lines.push("Now design the course and call study_apply_design with:");
-	lines.push("{ \"sections\": [ { \"title\": \"...\", \"lessons\": [ { \"title\": \"...\", \"file\": \"<exact path from this brief>\", \"anchor\": \"<optional full heading text>\", \"world\": \"study\" | \"practice\" } ] } ] }");
+	lines.push("{ \"languageTarget\": \"<only for language courses>\", \"sections\": [ { \"title\": \"...\", \"lessons\": [ { \"title\": \"...\", \"file\": \"<exact path from this brief>\", \"anchor\": \"<optional full heading text>\", \"world\": \"study\" | \"practice\" } ] } ] }");
 	lines.push("Use ONLY file paths that appear in this brief — anything else is dropped. Apply directly, then walk the learner through the course map.");
 	return lines.join("\n");
 }
@@ -6126,50 +6177,56 @@ function studyTools(store, deps = {}) {
 	const applyDesign = defineTool({
 		name: "study_apply_design",
 		description: "Apply the tutor-designed course structure to the pending import (the one study_import_github or study_import_folder returned design_required for). Every lesson's file must come from the design brief — unknown paths are dropped (anti-hallucination); lesson bodies are sliced by their anchor heading and the course is imported. On a validation or fetch error the tutor fixes the design and simply calls again.",
-		parameters: { sections: {
-			type: "array",
-			required: true,
-			description: "Designed sections in learning order.",
-			items: {
-				type: "object",
-				additionalProperties: false,
-				properties: {
-					title: {
-						type: "string",
-						required: true,
-						description: "Section title (in the learner's language)."
-					},
-					lessons: {
-						type: "array",
-						required: true,
-						items: {
-							type: "object",
-							additionalProperties: false,
-							properties: {
-								title: {
-									type: "string",
-									required: true,
-									description: "Lesson title."
-								},
-								file: {
-									type: "string",
-									required: true,
-									description: "Exact file path from the design brief."
-								},
-								anchor: {
-									type: "string",
-									description: "Full H2/H3 heading text the lesson body starts at; omit for whole-file lessons."
-								},
-								world: {
-									type: "string",
-									description: "\"study\" (explanation) or \"practice\" (exercise/lab/notebook); anything else is treated as study."
+		parameters: {
+			languageTarget: {
+				type: "string",
+				description: "Set ONLY when this course teaches a language ITSELF (vocabulary, grammar, reading/writing of English/Japanese/Chinese/…) rather than being a knowledge/tech course that merely happens to be written in some language: the taught language as a BCP-47 tag (\"en\", \"ja\", \"zh-CN\", …). The writing language is NOT the taught language — a Chinese-written English-textbook repo has languageTarget \"en\". Typical tells: vocab lists, grammar points, dialogues/readings, sentence-translation pairs, level markers (N5/N1, TOEFL, HSK, JLPT), pronunciation content. When unsure, omit it — a normal course misflagged as a language course is worse than the reverse."
+			},
+			sections: {
+				type: "array",
+				required: true,
+				description: "Designed sections in learning order.",
+				items: {
+					type: "object",
+					additionalProperties: false,
+					properties: {
+						title: {
+							type: "string",
+							required: true,
+							description: "Section title (in the learner's language)."
+						},
+						lessons: {
+							type: "array",
+							required: true,
+							items: {
+								type: "object",
+								additionalProperties: false,
+								properties: {
+									title: {
+										type: "string",
+										required: true,
+										description: "Lesson title."
+									},
+									file: {
+										type: "string",
+										required: true,
+										description: "Exact file path from the design brief."
+									},
+									anchor: {
+										type: "string",
+										description: "Full H2/H3 heading text the lesson body starts at; omit for whole-file lessons."
+									},
+									world: {
+										type: "string",
+										description: "\"study\" (explanation) or \"practice\" (exercise/lab/notebook); anything else is treated as study."
+									}
 								}
 							}
 						}
 					}
 				}
 			}
-		} },
+		},
 		output: {
 			schema: {
 				type: "object",
@@ -6202,12 +6259,21 @@ function studyTools(store, deps = {}) {
 					droppedLessons: {
 						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."
 					}
 				}
 			},
 			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` : ""}). 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) {
@@ -6236,12 +6302,20 @@ 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 value = mutate((state) => toImportValue(importCourse(state, parsed, pd.source, pd.url)));
+			const languageTarget = typeof args.languageTarget === "string" && args.languageTarget.trim() !== "" ? args.languageTarget.trim().slice(0, 35) : null;
+			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 {
 				...value,
-				droppedLessons: validated.droppedLessons
+				droppedLessons: validated.droppedLessons,
+				...languageTarget !== null ? { languageTarget } : {}
 			};
 		},
 		timeoutMs: 18e4,
@@ -8690,6 +8764,45 @@ function studyTools(store, deps = {}) {
 	];
 }
 //#endregion
+//#region src/vendor/locale-names.ts
+/**
+* Vendored from LookatStudy shared/locales.ts (MIT License,
+* https://github.com/Kaiji-Z/LookatStudy), upstream v0.33.2 — only the
+* name-map + lookup function (the language-course round's BCP-47 → display
+* name need). Unmodified except this provenance header.
+*
+* locales —— BCP-47 → 人类可读语言名的共享映射(纯函数)。
+* 未知 locale 一律原样返回(如 "pt" → "pt"),不猜名字。
+*/
+/** locale → 该语言的自称名(尽量用母语写法,语言学习者认得出) */
+const LOCALE_LANGUAGE_NAMES = {
+	en: "English",
+	"zh-CN": "中文",
+	"zh-TW": "繁體中文",
+	ja: "日本語",
+	ko: "한국어",
+	fr: "Français",
+	de: "Deutsch",
+	es: "Español",
+	"pt-BR": "Português",
+	ru: "Русский",
+	it: "Italiano",
+	ar: "العربية",
+	hi: "हिन्दी",
+	tr: "Türkçe",
+	pl: "Polski",
+	nl: "Nederlands",
+	id: "Indonesia",
+	vi: "Tiếng Việt",
+	th: "ไทย",
+	sv: "Svenska",
+	fi: "Suomi"
+};
+/** BCP-47 → 语言名;未映射的 locale 原样返回 */
+function localeToLanguageName(locale) {
+	return LOCALE_LANGUAGE_NAMES[locale] ?? locale;
+}
+//#endregion
 //#region src/surface.ts
 /**
 * Stable tutor core (ported from LookatStudy's BASE_AGENT_PROMPT plus its
@@ -8800,6 +8913,16 @@ function snapshotSectionText(state) {
 	if (memory.length > 0) lines.push(`记忆: ${memory.join(" | ")}`);
 	if (snap.dueCount > 0) lines.push(`今日待复习: ${snap.dueCount} 项`);
 	if (snap.pendingProposal !== null) lines.push(`待决提案 ${snap.pendingProposal.id}: ${snap.pendingProposal.rationale}(等学习者表态)`);
+	const focusCourse = state.courses.find((c) => c.id === snap.focus?.courseId);
+	if (focusCourse?.languageTarget != null && focusCourse.languageTarget !== "") {
+		const t = localeToLanguageName(focusCourse.languageTarget);
+		lines.push("");
+		lines.push(`【语言教学姿态】这门课程教的是${t}——教学语言(讲解、指令、反馈)跟随学习者的界面语言,${t}是学习对象:`);
+		lines.push(`- 课文引用、例句、题目素材保持${t}原文,考察目标语言本身——不要把目标语言材料翻译成教学语言来讲解或出题(生词首次出现可附教学语言注释,注释是辅助不是替代);`);
+		lines.push(`- 出题双轴:题干和选项中的语言素材(句子/单词/短语/语法点)用${t}原文,指令性文字和解析用教学语言;`);
+		lines.push(`- 学习者用${t}造句或表达时,先肯定再纠正其中的语言错误(语法/用词/拼写),用教学语言讲清错在哪;`);
+		lines.push(`- 随掌握度上升,渐进提高${t}素材的占比,把学习者往"直接用${t}读"带。`);
+	}
 	if (state.historyBudget === true) lines.push("历史预算已开启:当会话变长时,主动概括旧轮次的要点并基于概要继续,避免逐字复读历史。");
 	return lines.join("\n");
 }

package/package.json

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