@novedu/cli 0.5.0 → 0.6.0

package/README.md

@@ -14,21 +14,21 @@ the same one the app would accept — no separate, drifting rules.
 
 ```bash
 # Validate a local file (relative fragment_files resolve from the same folder)
-npx @novedu/cli validate ./tutors/simple-tutor.yaml
+npx @novedu/cli validate ./activities/tutors/simple-tutor.yaml
 
 # Validate a published tutor by URL
-npx @novedu/cli validate https://raw.githubusercontent.com/Teaching-HTL-Leonding/novedu-chat-mvp/refs/heads/main/tutors/simple-tutor.yaml
+npx @novedu/cli validate https://raw.githubusercontent.com/Teaching-HTL-Leonding/novedu-chat-mvp/refs/heads/main/activities/tutors/simple-tutor.yaml
 
 # Validate a fragment library on its own
-npx @novedu/cli validate ./tutors/simple-fragments.yaml --kind fragment
+npx @novedu/cli validate ./activities/tutors/simple-fragments.yaml --kind fragment
 
 # Validate a quiz, a writing activity, or a coding activity
-npx @novedu/cli validate ./quizzes/sample-quiz.yaml --kind quiz
-npx @novedu/cli validate ./writings/human-animal-short-story.yaml --kind writing
-npx @novedu/cli validate ./coding/beginner-typescript.yaml --kind coding
+npx @novedu/cli validate ./activities/quizzes/sample-quiz.yaml --kind quiz
+npx @novedu/cli validate ./activities/writings/human-animal-short-story.yaml --kind writing
+npx @novedu/cli validate ./activities/coding/beginner-typescript.yaml --kind coding
 
 # Machine-readable output (the raw validation result)
-npx @novedu/cli validate ./tutors/simple-tutor.yaml --json
+npx @novedu/cli validate ./activities/tutors/simple-tutor.yaml --json
 ```
 
 `--kind` accepts `tutor` (default), `fragment`, `quiz`, `writing`, or `coding`; it
@@ -42,7 +42,7 @@ as a pre-commit / CI gate.
 The CLI lives in the app repo as an npm workspace.
 
 ```bash
-npm run cli -- validate ./tutors/simple-tutor.yaml   # run from source via tsx
+npm run cli -- validate ./activities/tutors/simple-tutor.yaml   # run from source via tsx
 npm run cli:build                                    # bundle to cli/dist via tsdown
 npm run test:cli                                     # build + integration tests (local & live URLs)
 ```

package/dist/main.js

@@ -242,6 +242,7 @@ function validate(value, schema, code, url) {
 		})
 	};
 }
+const providerSchema = z.enum(["SCCH", "Azure Foundry"]).default("SCCH");
 //#endregion
 //#region ../lib/tutors/schemas.ts
 /**
@@ -329,6 +330,7 @@ const TutorSchema = z.strictObject({
 	anonymous: z.boolean().optional(),
 	llm: z.strictObject({
 		model: z.string(),
+		provider: providerSchema,
 		imageInput: z.boolean().optional()
 	}),
 	prompt: z.strictObject({
@@ -446,7 +448,7 @@ function resolveRelativeUrl(ref, baseUrl) {
 * Resolve a fragment-file reference to an absolute URL. An absolute http(s) ref is used
 * as-is; anything else is treated as relative to the tutor URL — standard URL resolution
 * drops the tutor's filename and appends the relative path (so `general-fragments.yaml`
-* next to `.../tutors/linked-list-tutor.yaml` becomes `.../tutors/general-fragments.yaml`,
+* next to `.../activities/tutors/linked-list-tutor.yaml` becomes `.../activities/tutors/general-fragments.yaml`,
 * and `./` / `../` segments work too). Throws if a relative ref is unparseable; the schema
 * already guarantees the only inputs here are http(s) URLs or relative paths.
 */
@@ -596,6 +598,7 @@ async function loadAndBuildTutorPrompt(url, fetchImpl, opts = {}) {
 			ok: true,
 			prompt: assembleSystemPrompt(consistency.plan, tutor),
 			model: tutor.llm.model,
+			provider: tutor.llm.provider,
 			imageInput: tutor.llm.imageInput ?? true,
 			anonymous: tutor.anonymous ?? true,
 			title: tutor.title,
@@ -633,7 +636,10 @@ const CodingYamlSchema = z.strictObject({
 	id: z.string().min(1),
 	name: z.string().optional(),
 	title: z.string().optional(),
-	llm: z.strictObject({ model: z.string().min(1) }),
+	llm: z.strictObject({
+		model: z.string().min(1),
+		provider: providerSchema
+	}),
 	instructions: z.string().min(1)
 });
 //#endregion
@@ -655,6 +661,7 @@ function checkCodingValue(parsed, url) {
 		ok: true,
 		codingId: coding.id,
 		model: coding.llm.model,
+		provider: coding.llm.provider,
 		title: coding.title ?? null,
 		warnings: []
 	};
@@ -701,7 +708,10 @@ const QuizYamlSchema = z.strictObject({
 	description: z.string().optional(),
 	anonymous: z.boolean().optional(),
 	shuffle: z.boolean().optional(),
-	llm: z.strictObject({ model: z.string().min(1) }),
+	llm: z.strictObject({
+		model: z.string().min(1),
+		provider: providerSchema
+	}),
 	discussion: z.strictObject({ instructions: z.string().min(1) }).optional(),
 	questions: z.array(QuizQuestionSchema).min(1)
 });
@@ -745,6 +755,7 @@ function checkQuizValue(parsed, url) {
 		ok: true,
 		quizId: quiz.id,
 		model: quiz.llm.model,
+		provider: quiz.llm.provider,
 		questionCount: quiz.questions.length,
 		anonymous: quiz.anonymous ?? DEFAULT_ANONYMOUS$1,
 		title: quiz.title ?? null,
@@ -773,7 +784,10 @@ const WritingYamlSchema = z.strictObject({
 	title: z.string().optional(),
 	description: z.string().optional(),
 	anonymous: z.boolean().optional(),
-	llm: z.strictObject({ model: z.string().min(1) }),
+	llm: z.strictObject({
+		model: z.string().min(1),
+		provider: providerSchema
+	}),
 	instructions: z.string().min(1),
 	placeholder: z.string().optional()
 });
@@ -798,6 +812,7 @@ function checkWritingValue(parsed, url) {
 		ok: true,
 		writingId: writing.id,
 		model: writing.llm.model,
+		provider: writing.llm.provider,
 		anonymous: writing.anonymous ?? DEFAULT_ANONYMOUS,
 		title: writing.title ?? null,
 		warnings: []
@@ -1047,15 +1062,15 @@ function registerValidate(program) {
 	program.command("validate").description("Validate a tutor (default), fragment library, quiz, writing or coding YAML by local path or public http(s) URL").argument("<pathOrUrl>", "path to a tutor, fragment, quiz, writing or coding YAML file, or a public http(s) URL").option("--kind <kind>", `what the file is: ${VALIDATE_KINDS.map((k) => `'${k}'`).join(", ")} ('tutor' is the default)`, "tutor").option("--json", "print the raw validation result as JSON").addHelpText("after", `
 Examples:
   # Validate a tutor (also strict-renders every fragment in every referenced library)
-  $ novedu-cli validate ./tutors/my-tutor.yaml
+  $ novedu-cli validate ./activities/tutors/my-tutor.yaml
 
   # Validate a fragment library on its own
-  $ novedu-cli validate ./tutors/my-fragments.yaml --kind fragment
+  $ novedu-cli validate ./activities/tutors/my-fragments.yaml --kind fragment
 
   # Validate a quiz, a writing activity, or a coding activity
-  $ novedu-cli validate ./quizzes/my-quiz.yaml --kind quiz
-  $ novedu-cli validate ./writings/my-writing.yaml --kind writing
-  $ novedu-cli validate ./coding/my-coding.yaml --kind coding
+  $ novedu-cli validate ./activities/quizzes/my-quiz.yaml --kind quiz
+  $ novedu-cli validate ./activities/writings/my-writing.yaml --kind writing
+  $ novedu-cli validate ./activities/coding/my-coding.yaml --kind coding
 
   # Machine-readable output for CI
   $ novedu-cli validate https://example.com/tutor.yaml --json`).action(async (pathOrUrl, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novedu/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Command-line companion for the Novedu chat app. Validates tutor, fragment, quiz, writing and coding YAML definitions (more commands to follow).",
   "type": "module",
   "repository": {