@novedu/cli 0.16.0 → 0.17.0

package/dist/main.js

@@ -1380,11 +1380,31 @@ async function loadYaml(url, fetchImpl, opts = {}) {
 * Handlebars, so a literal `{{` in course material can never execute.
 */
 async function assembleFragmentPrompt(block, baseUrl, fetchImpl, opts = {}, hostText = "") {
+	const result = await assembleFragmentPrompts(block, baseUrl, fetchImpl, opts, [hostText]);
+	if (!result.ok) return result;
+	return {
+		ok: true,
+		prompt: result.prompts[0] ?? "",
+		warnings: result.warnings
+	};
+}
+/**
+* The multi-host variant of {@link assembleFragmentPrompt}: renders SEVERAL host texts
+* of the SAME document (e.g. a quiz's `instructions` and `discussion.instructions`)
+* against the document's one fragment block in a single pass — every fragment library
+* and text file is fetched and checked ONCE, placements are parsed per host but
+* consistency-checked in ONE pass over their union (so a library placed in any host
+* counts as used), and each host renders on its own. Any error fails the whole call
+* (fail closed); `prompts` is index-aligned with `hostTexts`. The template-semantics
+* opt-in applies identically: with neither list declared, ALL host texts return
+* byte-verbatim.
+*/
+async function assembleFragmentPrompts(block, baseUrl, fetchImpl, opts = {}, hostTexts = []) {
 	const warnings = [];
 	const allowedSchemes = opts.allowedSchemes ?? DEFAULT_ALLOWED_SCHEMES;
 	if (block.fragment_files.length === 0 && block.text_files.length === 0) return {
 		ok: true,
-		prompt: hostText,
+		prompts: [...hostTexts],
 		warnings
 	};
 	const fragmentSettledPromise = Promise.all(block.fragment_files.map(async (ref) => {
@@ -1497,13 +1517,14 @@ async function assembleFragmentPrompt(block, baseUrl, fetchImpl, opts = {}, host
 		libraryErrors.push(...checked.errors);
 		warnings.push(...checked.warnings);
 	}
-	const parsed = parseHostPlacements(hostText);
-	if (parsed.errors.length > 0) return {
+	const parsedHosts = hostTexts.map((hostText) => parseHostPlacements(hostText));
+	const parseErrors = parsedHosts.flatMap((parsed) => parsed.errors);
+	if (parseErrors.length > 0) return {
 		ok: false,
-		errors: [...libraryErrors, ...parsed.errors],
+		errors: [...libraryErrors, ...parseErrors],
 		warnings
 	};
-	const placementCheck = checkPlacements(parsed.placements, fragmentFilesByAlias, block.fragment_files, textFilesByAlias, block.text_files, opts.validateLibraries ?? false);
+	const placementCheck = checkPlacements(parsedHosts.flatMap((parsed) => parsed.placements), fragmentFilesByAlias, block.fragment_files, textFilesByAlias, block.text_files, opts.validateLibraries ?? false);
 	warnings.push(...placementCheck.warnings);
 	const preRenderErrors = [...libraryErrors, ...placementCheck.errors];
 	if (preRenderErrors.length > 0) return {
@@ -1511,28 +1532,33 @@ async function assembleFragmentPrompt(block, baseUrl, fetchImpl, opts = {}, host
 		errors: preRenderErrors,
 		warnings
 	};
-	try {
-		return {
-			ok: true,
-			prompt: renderHostTemplate(hostText, (ref, args) => {
-				const resolved = resolveAndMerge(ref, args, fragmentFilesByAlias);
-				if (resolved.content === null || resolved.errors.length > 0) throw new Error(`Fragment "${ref}" could not be resolved`);
-				return renderFragmentContent(resolved.content, resolved.variables);
-			}, (alias, from, to) => {
-				const body = textFilesByAlias.get(alias);
-				if (body === void 0) throw new Error(`Text file "${alias}" was not prefetched`);
-				if (from === void 0 && to === void 0) return body;
-				return sliceLines(body, from, to);
-			}),
-			warnings
-		};
+	const prompts = [];
+	const renderErrors = [];
+	for (const hostText of hostTexts) try {
+		prompts.push(renderHostTemplate(hostText, (ref, args) => {
+			const resolved = resolveAndMerge(ref, args, fragmentFilesByAlias);
+			if (resolved.content === null || resolved.errors.length > 0) throw new Error(`Fragment "${ref}" could not be resolved`);
+			return renderFragmentContent(resolved.content, resolved.variables);
+		}, (alias, from, to) => {
+			const body = textFilesByAlias.get(alias);
+			if (body === void 0) throw new Error(`Text file "${alias}" was not prefetched`);
+			if (from === void 0 && to === void 0) return body;
+			return sliceLines(body, from, to);
+		}));
 	} catch (e) {
-		return {
-			ok: false,
-			errors: [error("ASSEMBLY_ERROR", `Failed to render system prompt: ${e instanceof Error ? e.message : String(e)}`)],
-			warnings
-		};
+		const message = e instanceof Error ? e.message : String(e);
+		renderErrors.push(error("ASSEMBLY_ERROR", `Failed to render system prompt: ${message}`));
 	}
+	if (renderErrors.length > 0) return {
+		ok: false,
+		errors: renderErrors,
+		warnings
+	};
+	return {
+		ok: true,
+		prompts,
+		warnings
+	};
 }
 /**
 * Validate a fragment FILE on its own (the `--kind fragment` / "Fragment library"
@@ -1699,7 +1725,7 @@ const QuizYamlSchema = z.strictObject({
 		id: "llm",
 		description: "The single model + provider that grades and discusses answers."
 	}),
-	discussion: z.strictObject({ instructions: z.string().min(1).meta({ description: "Optional guidance appended to the per-question follow-up discussion chat's system prompt." }) }).optional().meta({
+	discussion: z.strictObject({ instructions: z.string().min(1).meta({ description: "Optional guidance appended to the per-question follow-up discussion chat's system prompt. When any fragment_files or text_files are declared, place fragments inline with {{fragment \"alias.id\" …}} and embed text files with {{file \"alias\"}} (escape a literal {{ as \\{{) — same rules as instructions." }) }).optional().meta({
 		id: "discussion",
 		description: "Optional guidance for the per-question follow-up discussion chat."
 	}),
@@ -1825,13 +1851,13 @@ async function checkInclude(ref, baseUrl, fetchImpl, opts) {
 		errors: [includeUnreadable(ref.id, includeUrl, checked.errors)],
 		warnings: checked.warnings
 	};
-	const assembled = await assembleFragmentPrompt({
+	const assembled = await assembleFragmentPrompts({
 		fragment_files: valid.data.fragment_files,
 		text_files: valid.data.text_files
 	}, includeUrl, fetchImpl, {
 		allowedSchemes: opts.allowedSchemes,
 		validateLibraries: opts.validateLibraries ?? true
-	}, valid.data.instructions ?? "");
+	}, [valid.data.instructions ?? "", valid.data.discussion?.instructions ?? ""]);
 	if (!assembled.ok) return {
 		ok: false,
 		errors: [includeUnreadable(ref.id, includeUrl, assembled.errors)],
@@ -1868,13 +1894,13 @@ async function loadAndCheckQuiz(url, fetchImpl, opts = {}) {
 	};
 	const checked = checkQuizParsed(valid.data);
 	if (!checked.ok) return checked;
-	const assembled = await assembleFragmentPrompt({
+	const assembled = await assembleFragmentPrompts({
 		fragment_files: valid.data.fragment_files,
 		text_files: valid.data.text_files
 	}, url, fetchImpl, {
 		allowedSchemes: opts.allowedSchemes,
 		validateLibraries: opts.validateLibraries ?? true
-	}, valid.data.instructions ?? "");
+	}, [valid.data.instructions ?? "", valid.data.discussion?.instructions ?? ""]);
 	const warnings = [...checked.warnings, ...assembled.warnings];
 	if (!assembled.ok) return {
 		ok: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novedu/cli",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Command-line companion for the Novedu chat app. Validates tutor, fragment, quiz, writing and coding YAML definitions; signs in with Entra ID and manages codes, app-hosted files and images over the app's API.",
   "type": "module",
   "repository": {