@tostudy-ai/cli 0.5.0 → 0.6.0

package/dist/cli.js

@@ -372,6 +372,23 @@ function progressBar(percent, width = 20) {
   const empty = width - filled;
   return "\u2588".repeat(filled) + "\u2591".repeat(empty) + ` ${clamped}%`;
 }
+function filterExerciseContent(content, tierIndex) {
+  const positions = [];
+  for (const pattern of TIER_HEADERS) {
+    const match = content.match(pattern);
+    if (match?.index != null) {
+      positions.push({ index: match.index, match: match[0] });
+    }
+  }
+  positions.sort((a, b2) => a.index - b2.index);
+  if (positions.length === 0) return content;
+  const intro = content.slice(0, positions[0].index).trimEnd();
+  const tierPos = positions[tierIndex];
+  if (!tierPos) return content;
+  const nextPos = positions[tierIndex + 1];
+  const tierContent = nextPos ? content.slice(tierPos.index, nextPos.index).trimEnd() : content.slice(tierPos.index).trimEnd();
+  return intro + "\n\n" + tierContent;
+}
 function formatCourseList(courses3) {
   if (courses3.length === 0) {
     return [
@@ -413,16 +430,17 @@ function formatProgress(data) {
   return lines.join("\n");
 }
 function formatLesson(data) {
-  const { lesson, wayfinding, progress: progress3 } = data;
+  const { lesson, wayfinding, progress: progress3, exercise } = data;
   const courseBar = progressBar(progress3.coursePercent);
   const moduleBar = progressBar(progress3.modulePercent);
+  const tierSuffix = exercise ? ` \xB7 ${exercise.tierLabel} (${exercise.index + 1}/${exercise.total})` : "";
   const lines = [
-    `\u2501\u2501\u2501 M\xF3dulo ${wayfinding.moduleOrder}/${wayfinding.totalModules} \xB7 Li\xE7\xE3o ${wayfinding.lessonOrder}/${wayfinding.totalLessons} \u2501\u2501\u2501`,
+    `\u2501\u2501\u2501 M\xF3dulo ${wayfinding.moduleOrder}/${wayfinding.totalModules} \xB7 Li\xE7\xE3o ${wayfinding.lessonOrder}/${wayfinding.totalLessons}${tierSuffix} \u2501\u2501\u2501`,
     "",
     `\u{1F4D6} ${lesson.title}`,
     `   M\xF3dulo: ${lesson.moduleTitle}  |  Tipo: ${lesson.type}`,
     "",
-    lesson.content,
+    exercise ? filterExerciseContent(lesson.content, exercise.index) : lesson.content,
     "",
     `  Curso:   ${courseBar}`,
     `  M\xF3dulo:  ${moduleBar}`
@@ -433,12 +451,21 @@ function formatLesson(data) {
   if (lesson.exerciseContent) {
     lines.push("", "\u2500\u2500\u2500 Exerc\xEDcio \u2500\u2500\u2500", lesson.exerciseContent);
   }
-  lines.push(
-    "",
-    "\u2192 tostudy validate <resposta>  para validar sua solu\xE7\xE3o",
-    "\u2192 tostudy hint                 para obter uma dica",
-    "\u2192 tostudy next                 para avan\xE7ar (ap\xF3s completar)"
-  );
+  if (/^checkpoint/i.test(lesson.title.trim())) {
+    lines.push(
+      "",
+      "\u{1F4A1} Escreva suas respostas num arquivo (ex: checkpoint.md) e valide:",
+      "   tostudy validate checkpoint.md",
+      "\u2192 tostudy next                 para avan\xE7ar"
+    );
+  } else {
+    lines.push(
+      "",
+      "\u2192 tostudy validate <resposta>  para validar sua solu\xE7\xE3o",
+      "\u2192 tostudy hint                 para obter uma dica",
+      "\u2192 tostudy next                 para avan\xE7ar (ap\xF3s completar)"
+    );
+  }
   return lines.join("\n");
 }
 function formatValidation(data) {
@@ -510,9 +537,11 @@ function formatModuleStart(data) {
   );
   return lines.join("\n");
 }
+var TIER_HEADERS;
 var init_formatter = __esm({
   "src/output/formatter.ts"() {
     "use strict";
+    TIER_HEADERS = [/^## Prática Guiada/im, /^## Prática Semi-?[Gg]uiada/im, /^## Desafio/im];
   }
 });
 
@@ -2176,11 +2205,14 @@ var init_select = __esm({
             enrollmentId = found.enrollmentId;
           }
         }
+        const matched = courses3.find((c) => c.courseId === courseId);
         const detail = await selectCourse({ userId: session.userId, courseId }, deps);
         await setActiveCourse({
           courseId: detail.courseId,
           courseTitle: detail.courseTitle,
-          enrollmentId
+          enrollmentId,
+          courseTags: matched?.tags,
+          courseLevel: matched?.level
         });
         if (opts.json) {
           output({ ...detail, enrollmentId }, { json: true });
@@ -3785,7 +3817,7 @@ var init_query_promise = __esm({
 function mapResultRow(columns, row, joinsNotNullableMap) {
   const nullifyMap = {};
   const result = columns.reduce(
-    (result2, { path: path12, field }, columnIndex) => {
+    (result2, { path: path14, field }, columnIndex) => {
       let decoder;
       if (is(field, Column)) {
         decoder = field;
@@ -3797,8 +3829,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
         decoder = field.sql.decoder;
       }
       let node = result2;
-      for (const [pathChunkIndex, pathChunk] of path12.entries()) {
-        if (pathChunkIndex < path12.length - 1) {
+      for (const [pathChunkIndex, pathChunk] of path14.entries()) {
+        if (pathChunkIndex < path14.length - 1) {
           if (!(pathChunk in node)) {
             node[pathChunk] = {};
           }
@@ -3806,8 +3838,8 @@ function mapResultRow(columns, row, joinsNotNullableMap) {
         } else {
           const rawValue = row[columnIndex];
           const value = node[pathChunk] = rawValue === null ? null : decoder.mapFromDriverValue(rawValue);
-          if (joinsNotNullableMap && is(field, Column) && path12.length === 2) {
-            const objectName = path12[0];
+          if (joinsNotNullableMap && is(field, Column) && path14.length === 2) {
+            const objectName = path14[0];
             if (!(objectName in nullifyMap)) {
               nullifyMap[objectName] = value === null ? getTableName(field.table) : false;
             } else if (typeof nullifyMap[objectName] === "string" && nullifyMap[objectName] !== getTableName(field.table)) {
@@ -7754,13 +7786,13 @@ function Subscribe(postgres2, options) {
       }
     }
     function handle(a, b2) {
-      const path12 = b2.relation.schema + "." + b2.relation.table;
+      const path14 = b2.relation.schema + "." + b2.relation.table;
       call("*", a, b2);
-      call("*:" + path12, a, b2);
-      b2.relation.keys.length && call("*:" + path12 + "=" + b2.relation.keys.map((x2) => a[x2.name]), a, b2);
+      call("*:" + path14, a, b2);
+      b2.relation.keys.length && call("*:" + path14 + "=" + b2.relation.keys.map((x2) => a[x2.name]), a, b2);
       call(b2.command, a, b2);
-      call(b2.command + ":" + path12, a, b2);
-      b2.relation.keys.length && call(b2.command + ":" + path12 + "=" + b2.relation.keys.map((x2) => a[x2.name]), a, b2);
+      call(b2.command + ":" + path14, a, b2);
+      b2.relation.keys.length && call(b2.command + ":" + path14 + "=" + b2.relation.keys.map((x2) => a[x2.name]), a, b2);
     }
     function pong() {
       const x2 = Buffer.alloc(34);
@@ -7873,8 +7905,8 @@ function parseEvent(x) {
   const xs = x.match(/^(\*|insert|update|delete)?:?([^.]+?\.?[^=]+)?=?(.+)?/i) || [];
   if (!xs)
     throw new Error("Malformed subscribe pattern: " + x);
-  const [, command, path12, key] = xs;
-  return (command || "*") + (path12 ? ":" + (path12.indexOf(".") === -1 ? "public." + path12 : path12) : "") + (key ? "=" + key : "");
+  const [, command, path14, key] = xs;
+  return (command || "*") + (path14 ? ":" + (path14.indexOf(".") === -1 ? "public." + path14 : path14) : "") + (key ? "=" + key : "");
 }
 var noop2;
 var init_subscribe = __esm({
@@ -8012,10 +8044,10 @@ function Postgres(a, b2) {
       });
       return query;
     }
-    function file2(path12, args = [], options2 = {}) {
+    function file2(path14, args = [], options2 = {}) {
       arguments.length === 2 && !Array.isArray(args) && (options2 = args, args = []);
       const query = new Query([], args, (query2) => {
-        fs5.readFile(path12, "utf8", (err, string4) => {
+        fs5.readFile(path14, "utf8", (err, string4) => {
           if (err)
             return query2.reject(err);
           query2.strings = [string4];
@@ -13073,10 +13105,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path12) {
-  if (!path12)
+function getElementAtPath(obj, path14) {
+  if (!path14)
     return obj;
-  return path12.reduce((acc, key) => acc?.[key], obj);
+  return path14.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -13388,11 +13420,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path12, issues) {
+function prefixIssues(path14, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path12);
+    iss.path.unshift(path14);
     return iss;
   });
 }
@@ -13634,7 +13666,7 @@ function formatError(error49, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error49, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error50, path12 = []) => {
+  const processError = (error50, path14 = []) => {
     var _a2, _b;
     for (const issue2 of error50.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -13644,7 +13676,7 @@ function treeifyError(error49, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path12, ...issue2.path];
+        const fullpath = [...path14, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -13676,8 +13708,8 @@ function treeifyError(error49, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path12 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path12) {
+  const path14 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path14) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -26371,13 +26403,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path12 = ref.slice(1).split("/").filter(Boolean);
-  if (path12.length === 0) {
+  const path14 = ref.slice(1).split("/").filter(Boolean);
+  if (path14.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path12[0] === defsKey) {
-    const key = path12[1];
+  if (path14[0] === defsKey) {
+    const key = path14[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -39940,6 +39972,7 @@ var init_start = __esm({
         const data = createHttpProvider(session.apiUrl, session.token);
         const deps = { data, logger: logger5 };
         const moduleData = await startModule({ enrollmentId: activeCourse.enrollmentId }, deps);
+        await setActiveCourse({ ...activeCourse, currentLessonId: moduleData.firstLesson.id });
         if (opts.json) {
           output(moduleData, { json: true });
         } else {
@@ -39979,12 +40012,18 @@ var init_start_next = __esm({
         const data = createHttpProvider(session.apiUrl, session.token);
         const deps = { data, logger: logger6 };
         const moduleData = await startNextModule({ enrollmentId: activeCourse.enrollmentId }, deps);
+        await setActiveCourse({ ...activeCourse, currentLessonId: moduleData.firstLesson.id });
         if (opts.json) {
           output(moduleData, { json: true });
         } else {
           output(formatModuleStart(moduleData), { json: false });
         }
       } catch (err) {
+        if (err instanceof CliApiError && err.message === "COURSE_COMPLETE") {
+          process.stderr.write("\u{1F389} Parab\xE9ns! Curso conclu\xEDdo!\n");
+          process.stderr.write("\u2192 tostudy courses  para ver outros cursos\n");
+          process.exit(0);
+        }
         const msg = err instanceof Error ? err.message : String(err);
         error(msg);
       }
@@ -40016,16 +40055,34 @@ var init_next = __esm({
           { enrollmentId: activeCourse.enrollmentId, userConfirmation: "cli-next" },
           deps
         );
+        await setActiveCourse({ ...activeCourse, currentLessonId: lessonData.lesson.id });
         if (opts.json) {
           output(lessonData, { json: true });
         } else {
           output(formatLesson(lessonData), { json: false });
         }
       } catch (err) {
-        if (err instanceof CliApiError && err.status === 403 && err.message === "CHANNEL_MISMATCH") {
-          process.stderr.write("Este curso n\xE3o est\xE1 dispon\xEDvel via CLI.\n");
-          process.stderr.write("Acesse tostudy.ai para estudar este curso pelo ChatStudy.\n");
-          process.exit(1);
+        if (err instanceof CliApiError) {
+          if (err.status === 403 && err.message === "CHANNEL_MISMATCH") {
+            process.stderr.write("Este curso n\xE3o est\xE1 dispon\xEDvel via CLI.\n");
+            process.stderr.write("Acesse tostudy.ai para estudar este curso pelo ChatStudy.\n");
+            process.exit(1);
+          }
+          if (err.message === "MODULE_COMPLETE") {
+            process.stderr.write("\u2713 M\xF3dulo conclu\xEDdo!\n");
+            process.stderr.write("\u2192 tostudy start-next  para iniciar o pr\xF3ximo m\xF3dulo\n");
+            process.exit(0);
+          }
+          if (err.message === "COURSE_COMPLETE") {
+            process.stderr.write("\u{1F389} Parab\xE9ns! Curso conclu\xEDdo!\n");
+            process.stderr.write("\u2192 tostudy courses  para ver outros cursos\n");
+            process.exit(0);
+          }
+          if (err.message === "NO_ACTIVE_LESSON") {
+            process.stderr.write("Nenhuma li\xE7\xE3o em progresso.\n");
+            process.stderr.write("\u2192 tostudy start-next  para iniciar o pr\xF3ximo m\xF3dulo\n");
+            process.exit(0);
+          }
         }
         const msg = err instanceof Error ? err.message : String(err);
         error(msg);
@@ -40034,13 +40091,46 @@ var init_next = __esm({
   }
 });
 
+// src/workspace/resolve.ts
+import fs6 from "node:fs/promises";
+import path5 from "node:path";
+import os6 from "node:os";
+function courseSlug(title) {
+  return title.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
+}
+async function resolveWorkspace(courseTitle, basePath = DEFAULT_BASE) {
+  const slug = courseSlug(courseTitle);
+  const candidate = path5.join(basePath, slug);
+  try {
+    await fs6.access(path5.join(candidate, ".ana-config.json"));
+    return { found: true, workspacePath: candidate };
+  } catch {
+    return { found: false, workspacePath: null };
+  }
+}
+var DEFAULT_BASE;
+var init_resolve = __esm({
+  "src/workspace/resolve.ts"() {
+    "use strict";
+    DEFAULT_BASE = path5.join(os6.homedir(), "study");
+  }
+});
+
 // src/commands/lesson.ts
 import { Command as Command11 } from "commander";
+function adjustTimeEstimate(type, baseMinutes) {
+  if (type === "exercise") return Math.max(baseMinutes, 30);
+  return baseMinutes;
+}
+function isCheckpoint(title) {
+  return /^checkpoint/i.test(title.trim());
+}
 function formatLessonContent(data) {
+  const time4 = adjustTimeEstimate(data.type, data.estimatedTimeMinutes);
   const lines = [
     `\u2501\u2501\u2501 Li\xE7\xE3o: ${data.title} \u2501\u2501\u2501`,
     "",
-    `Tipo: ${data.type}  |  Dura\xE7\xE3o estimada: ~${data.estimatedTimeMinutes} min`,
+    `Tipo: ${data.type}  |  Dura\xE7\xE3o estimada: ~${time4} min`,
     "",
     data.content
   ];
@@ -40050,12 +40140,20 @@ function formatLessonContent(data) {
   if (data.hints && data.hints.length > 0) {
     lines.push("", `Dicas dispon\xEDveis: ${data.hints.length}`);
   }
-  lines.push(
-    "",
-    "\u2192 tostudy validate <arquivo>  para validar sua solu\xE7\xE3o",
-    "\u2192 tostudy hint                para obter uma dica",
-    "\u2192 tostudy next                para avan\xE7ar para a pr\xF3xima li\xE7\xE3o"
-  );
+  if (isCheckpoint(data.title)) {
+    lines.push(
+      "",
+      "\u{1F4A1} Escreva suas respostas num arquivo (ex: checkpoint.md) e valide:",
+      "   tostudy validate checkpoint.md"
+    );
+  } else {
+    lines.push(
+      "",
+      "\u2192 tostudy validate <arquivo>  para validar sua solu\xE7\xE3o",
+      "\u2192 tostudy hint                para obter uma dica",
+      "\u2192 tostudy next                para avan\xE7ar para a pr\xF3xima li\xE7\xE3o"
+    );
+  }
   return lines.join("\n");
 }
 var logger8, lessonCommand;
@@ -40067,6 +40165,7 @@ var init_lesson = __esm({
     init_http2();
     init_session();
     init_formatter();
+    init_resolve();
     logger8 = createLogger("cli:lesson");
     lessonCommand = new Command11("lesson").description("Show the content of the current lesson").option("--json", "Output structured JSON").action(async (opts) => {
       try {
@@ -40086,6 +40185,14 @@ var init_lesson = __esm({
         } else {
           output(formatLessonContent(content), { json: false });
         }
+        if (content.type === "exercise") {
+          const ws = await resolveWorkspace(activeCourse.courseTitle);
+          if (!ws.found) {
+            process.stderr.write(
+              "\n\u{1F4A1} Dica: rode `tostudy workspace setup` para criar um workspace local para exerc\xEDcios.\n"
+            );
+          }
+        }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         error(msg);
@@ -40158,134 +40265,26 @@ var init_exercises = __esm({
   }
 });
 
-// src/commands/validate.ts
-import fs6 from "node:fs";
-import { Command as Command13 } from "commander";
-var logger10, validateCommand;
-var init_validate = __esm({
-  "src/commands/validate.ts"() {
-    "use strict";
-    init_src();
-    init_exercises();
-    init_http2();
-    init_session();
-    init_formatter();
-    logger10 = createLogger("cli:validate");
-    validateCommand = new Command13("validate").description("Validate your solution for the current exercise").argument("[file]", "Path to the solution file to read").option("--stdin", "Read solution from stdin instead of a file").option("--json", "Output structured JSON").action(async (file2, opts) => {
-      try {
-        const session = await requireSession();
-        const activeCourse = await requireActiveCourse();
-        const driftWarning = await checkCourseDrift();
-        if (driftWarning) process.stderr.write(driftWarning + "\n");
-        const lessonId = activeCourse.currentLessonId;
-        if (!lessonId) {
-          error("Nenhuma li\xE7\xE3o ativa encontrada. Rode: tostudy start  ou  tostudy next");
-        }
-        let solution;
-        if (opts.stdin) {
-          solution = fs6.readFileSync("/dev/stdin", "utf-8");
-        } else if (file2) {
-          if (!fs6.existsSync(file2)) {
-            error(`Arquivo n\xE3o encontrado: ${file2}`);
-          }
-          solution = fs6.readFileSync(file2, "utf-8");
-        } else {
-          error("Forne\xE7a um arquivo ou use --stdin.\n\nExemplo: tostudy validate resposta.md");
-        }
-        const data = createHttpProvider(session.apiUrl, session.token);
-        const deps = { data, logger: logger10 };
-        const result = await validateSolution(
-          {
-            lessonId,
-            solution,
-            userId: session.userId,
-            enrollmentId: activeCourse.enrollmentId
-          },
-          deps
-        );
-        if (opts.json) {
-          output(result, { json: true });
-        } else {
-          output(formatValidation(result), { json: false });
-        }
-        process.exit(result.passed ? 0 : 1);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        error(msg);
-      }
-    });
-  }
-});
-
-// src/commands/menu.ts
-import { Command as Command14 } from "commander";
-var menuCommand;
-var init_menu = __esm({
-  "src/commands/menu.ts"() {
-    "use strict";
-    init_session();
-    init_formatter();
-    menuCommand = new Command14("menu").description("Show available commands and current study context").action(async () => {
-      const session = await getSession();
-      const activeCourse = session ? await getActiveCourse() : null;
-      const lines = [
-        "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510",
-        "\u2502             ToStudy CLI \u2014 Menu              \u2502",
-        "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518",
-        ""
-      ];
-      if (!session) {
-        lines.push(
-          "  Status: N\xE3o autenticado",
-          "",
-          "  Para come\xE7ar:",
-          "    tostudy login          Autenticar com sua conta ToStudy",
-          ""
-        );
-      } else {
-        lines.push(`  Usu\xE1rio: ${session.userName}`);
-        if (activeCourse) {
-          lines.push(`  Curso ativo: ${activeCourse.courseTitle}`, "");
-        } else {
-          lines.push(
-            "  Curso ativo: (nenhum)",
-            "  \u2192 tostudy courses   para ver seus cursos",
-            "  \u2192 tostudy select <n\xFAmero>  para ativar um curso",
-            ""
-          );
-        }
-        lines.push(
-          "  \u2500\u2500\u2500 Navega\xE7\xE3o \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-          "    tostudy courses        Listar seus cursos",
-          "    tostudy select <id>    Ativar um curso",
-          "    tostudy progress       Ver progresso do curso ativo",
-          "",
-          "  \u2500\u2500\u2500 Estudo \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-          "    tostudy start          Iniciar/retomar o m\xF3dulo atual",
-          "    tostudy start-next     Avan\xE7ar para o pr\xF3ximo m\xF3dulo",
-          "    tostudy next           Avan\xE7ar para a pr\xF3xima li\xE7\xE3o",
-          "    tostudy lesson         Ver conte\xFAdo da li\xE7\xE3o atual",
-          "",
-          "  \u2500\u2500\u2500 Exerc\xEDcios \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-          "    tostudy validate <arquivo>  Validar sua solu\xE7\xE3o",
-          "    tostudy hint                Obter uma dica progressiva",
-          "",
-          "  \u2500\u2500\u2500 Dicas r\xE1pidas \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
-          "    Adicione --json a qualquer comando para sa\xEDda em JSON",
-          "    Adicione --help a qualquer comando para ver op\xE7\xF5es",
-          ""
-        );
-      }
-      output(lines.join("\n"), { json: false });
-    });
-  }
-});
-
 // src/output/init-template.ts
+function detectTechFromTags(tags) {
+  const found = /* @__PURE__ */ new Set();
+  const keywords = Object.keys(LANGUAGE_TAGS);
+  const joined = tags.map((t) => t.toLowerCase()).join(" ");
+  for (const kw of keywords) {
+    const pattern = new RegExp(`\\b${kw.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`);
+    if (pattern.test(joined)) {
+      found.add(kw);
+    }
+  }
+  return [...found];
+}
 function formatCourseLanguage(tags) {
   if (!tags || tags.length === 0) return "Programa\xE7\xE3o";
-  const matched = tags.map((t) => LANGUAGE_TAGS[t.toLowerCase()]).filter(Boolean);
-  return matched.length > 0 ? matched.slice(0, 3).join(" / ") : "Programa\xE7\xE3o";
+  const direct = tags.map((t) => LANGUAGE_TAGS[t.toLowerCase()]).filter(Boolean);
+  if (direct.length > 0) return direct.slice(0, 3).join(" / ");
+  const detected = detectTechFromTags(tags);
+  const mapped = detected.map((t) => LANGUAGE_TAGS[t]).filter(Boolean);
+  return mapped.length > 0 ? mapped.slice(0, 3).join(" / ") : "Programa\xE7\xE3o";
 }
 function formatCourseLevel(level) {
   const map2 = {
@@ -40405,6 +40404,167 @@ var init_init_template = __esm({
   }
 });
 
+// src/commands/validate.ts
+import fs7 from "node:fs";
+import path6 from "node:path";
+import { Command as Command13 } from "commander";
+var logger10, validateCommand;
+var init_validate = __esm({
+  "src/commands/validate.ts"() {
+    "use strict";
+    init_src();
+    init_exercises();
+    init_http2();
+    init_session();
+    init_formatter();
+    init_init_template();
+    logger10 = createLogger("cli:validate");
+    validateCommand = new Command13("validate").description("Validate your solution for the current exercise").argument("[file]", "Path to the solution file to read").option("--stdin", "Read solution from stdin instead of a file").option("--json", "Output structured JSON").action(async (file2, opts) => {
+      try {
+        const session = await requireSession();
+        const activeCourse = await requireActiveCourse();
+        const driftWarning = await checkCourseDrift();
+        if (driftWarning) process.stderr.write(driftWarning + "\n");
+        const lessonId = activeCourse.currentLessonId;
+        if (!lessonId) {
+          error("Nenhuma li\xE7\xE3o ativa encontrada. Rode: tostudy start  ou  tostudy next");
+        }
+        let solution;
+        if (opts.stdin) {
+          solution = fs7.readFileSync("/dev/stdin", "utf-8");
+        } else if (file2) {
+          if (!fs7.existsSync(file2)) {
+            error(`Arquivo n\xE3o encontrado: ${file2}`);
+          }
+          solution = fs7.readFileSync(file2, "utf-8");
+        } else {
+          error("Forne\xE7a um arquivo ou use --stdin.\n\nExemplo: tostudy validate resposta.md");
+        }
+        if (file2 && activeCourse.courseTags?.length) {
+          const ext = path6.extname(file2).toLowerCase();
+          const LANG_EXTENSIONS = {
+            ".html": ["html", "html5"],
+            ".css": ["css"],
+            ".js": ["javascript", "node", "nodejs", "react", "vue", "angular", "svelte", "nextjs"],
+            ".ts": ["typescript", "react", "angular", "nextjs"],
+            ".tsx": ["typescript", "react", "nextjs"],
+            ".jsx": ["javascript", "react"],
+            ".py": ["python"],
+            ".go": ["go"],
+            ".rs": ["rust"],
+            ".java": ["java"],
+            ".kt": ["kotlin"],
+            ".swift": ["swift"],
+            ".rb": ["ruby"],
+            ".php": ["php"],
+            ".cs": ["csharp", "c#"],
+            ".cpp": ["cpp"],
+            ".sql": ["sql"],
+            ".vue": ["vue"]
+          };
+          const expectedTags = LANG_EXTENSIONS[ext];
+          if (expectedTags) {
+            const courseTech = detectTechFromTags(activeCourse.courseTags);
+            const matches = expectedTags.some((t) => courseTech.includes(t));
+            if (!matches) {
+              const lang = formatCourseLanguage(activeCourse.courseTags);
+              process.stderr.write(
+                `\u26A0\uFE0F Arquivo ${ext} \u2014 este curso \xE9 de ${lang}. Verifique se est\xE1 enviando o arquivo correto.
+
+`
+              );
+            }
+          }
+        }
+        const data = createHttpProvider(session.apiUrl, session.token);
+        const deps = { data, logger: logger10 };
+        const result = await validateSolution(
+          {
+            lessonId,
+            solution,
+            userId: session.userId,
+            enrollmentId: activeCourse.enrollmentId
+          },
+          deps
+        );
+        if (opts.json) {
+          output(result, { json: true });
+        } else {
+          output(formatValidation(result), { json: false });
+        }
+        process.exit(result.passed ? 0 : 1);
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        error(msg);
+      }
+    });
+  }
+});
+
+// src/commands/menu.ts
+import { Command as Command14 } from "commander";
+var menuCommand;
+var init_menu = __esm({
+  "src/commands/menu.ts"() {
+    "use strict";
+    init_session();
+    init_formatter();
+    menuCommand = new Command14("menu").description("Show available commands and current study context").action(async () => {
+      const session = await getSession();
+      const activeCourse = session ? await getActiveCourse() : null;
+      const lines = [
+        "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510",
+        "\u2502             ToStudy CLI \u2014 Menu              \u2502",
+        "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518",
+        ""
+      ];
+      if (!session) {
+        lines.push(
+          "  Status: N\xE3o autenticado",
+          "",
+          "  Para come\xE7ar:",
+          "    tostudy login          Autenticar com sua conta ToStudy",
+          ""
+        );
+      } else {
+        lines.push(`  Usu\xE1rio: ${session.userName}`);
+        if (activeCourse) {
+          lines.push(`  Curso ativo: ${activeCourse.courseTitle}`, "");
+        } else {
+          lines.push(
+            "  Curso ativo: (nenhum)",
+            "  \u2192 tostudy courses   para ver seus cursos",
+            "  \u2192 tostudy select <n\xFAmero>  para ativar um curso",
+            ""
+          );
+        }
+        lines.push(
+          "  \u2500\u2500\u2500 Navega\xE7\xE3o \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+          "    tostudy courses        Listar seus cursos",
+          "    tostudy select <id>    Ativar um curso",
+          "    tostudy progress       Ver progresso do curso ativo",
+          "",
+          "  \u2500\u2500\u2500 Estudo \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+          "    tostudy start          Iniciar/retomar o m\xF3dulo atual",
+          "    tostudy start-next     Avan\xE7ar para o pr\xF3ximo m\xF3dulo",
+          "    tostudy next           Avan\xE7ar para a pr\xF3xima li\xE7\xE3o",
+          "    tostudy lesson         Ver conte\xFAdo da li\xE7\xE3o atual",
+          "",
+          "  \u2500\u2500\u2500 Exerc\xEDcios \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+          "    tostudy validate <arquivo>  Validar sua solu\xE7\xE3o",
+          "    tostudy hint                Obter uma dica progressiva",
+          "",
+          "  \u2500\u2500\u2500 Dicas r\xE1pidas \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+          "    Adicione --json a qualquer comando para sa\xEDda em JSON",
+          "    Adicione --help a qualquer comando para ver op\xE7\xF5es",
+          ""
+        );
+      }
+      output(lines.join("\n"), { json: false });
+    });
+  }
+});
+
 // src/commands/init.ts
 import { Command as Command15 } from "commander";
 var logger11, initCommand;
@@ -40483,14 +40643,14 @@ Rode \`tostudy select <n\xFAmero>\` para ativar um curso.`,
 });
 
 // ../../packages/tostudy-core/src/workspace/setup-workspace.ts
-import fs7 from "node:fs/promises";
-import path5 from "node:path";
+import fs8 from "node:fs/promises";
+import path7 from "node:path";
 async function setupWorkspace(input) {
-  const workspacePath = path5.join(input.basePath, input.courseSlug);
+  const workspacePath = path7.join(input.basePath, input.courseSlug);
   for (const dir of WORKSPACE_DIRS) {
-    await fs7.mkdir(path5.join(workspacePath, dir), { recursive: true });
+    await fs8.mkdir(path7.join(workspacePath, dir), { recursive: true });
   }
-  const configPath = path5.join(workspacePath, ".ana-config.json");
+  const configPath = path7.join(workspacePath, ".ana-config.json");
   const config2 = {
     courseId: input.courseId,
     courseSlug: input.courseSlug,
@@ -40500,7 +40660,7 @@ async function setupWorkspace(input) {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     lastAccessedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  await fs7.writeFile(configPath, JSON.stringify(config2, null, 2), "utf-8");
+  await fs8.writeFile(configPath, JSON.stringify(config2, null, 2), "utf-8");
   const readme = [
     `# ${input.courseName}`,
     "",
@@ -40525,7 +40685,7 @@ async function setupWorkspace(input) {
     "tostudy vault sync      # Sincronizar progresso",
     "```"
   ].join("\n");
-  await fs7.writeFile(path5.join(workspacePath, "README.md"), readme, "utf-8");
+  await fs8.writeFile(path7.join(workspacePath, "README.md"), readme, "utf-8");
   return { workspacePath, directories: WORKSPACE_DIRS, configPath };
 }
 var WORKSPACE_DIRS;
@@ -40626,8 +40786,8 @@ var init_templates = __esm({
 });
 
 // ../../packages/tostudy-core/src/workspace/extract-exercise.ts
-import fs8 from "node:fs/promises";
-import path6 from "node:path";
+import fs9 from "node:fs/promises";
+import path8 from "node:path";
 function padOrder(n) {
   return String(n).padStart(2, "0");
 }
@@ -40651,16 +40811,16 @@ async function extractExercise(input) {
   const { lessonData, exerciseTier, workspacePath } = input;
   const moduleDir = `${padOrder(lessonData.moduleOrder)}-${lessonData.moduleSlug}`;
   const lessonDir = `${padOrder(lessonData.lessonOrder)}-${lessonData.lessonSlug}`;
-  const exercisePath = path6.join(workspacePath, "exercises", moduleDir, lessonDir);
-  await fs8.mkdir(exercisePath, { recursive: true });
+  const exercisePath = path8.join(workspacePath, "exercises", moduleDir, lessonDir);
+  await fs9.mkdir(exercisePath, { recursive: true });
   const extractedFiles = [];
   let hasStarterCode = false;
   if (lessonData.sandpackConfig?.files) {
     for (const [filePath, fileData] of Object.entries(lessonData.sandpackConfig.files)) {
       const cleanPath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
-      const fullPath = path6.join(exercisePath, cleanPath);
-      await fs8.mkdir(path6.dirname(fullPath), { recursive: true });
-      await fs8.writeFile(fullPath, fileData.code, "utf-8");
+      const fullPath = path8.join(exercisePath, cleanPath);
+      await fs9.mkdir(path8.dirname(fullPath), { recursive: true });
+      await fs9.writeFile(fullPath, fileData.code, "utf-8");
       extractedFiles.push(cleanPath);
       hasStarterCode = true;
     }
@@ -40668,13 +40828,13 @@ async function extractExercise(input) {
     const tierData = getTierData(lessonData.structuredData, exerciseTier);
     const tierCode = tierData?.code;
     if (tierCode) {
-      await fs8.writeFile(path6.join(exercisePath, "exercise.js"), tierCode, "utf-8");
+      await fs9.writeFile(path8.join(exercisePath, "exercise.js"), tierCode, "utf-8");
       extractedFiles.push("exercise.js");
       hasStarterCode = true;
     } else {
       const starter = getStarterCode(lessonData.structuredData);
       if (starter) {
-        await fs8.writeFile(path6.join(exercisePath, "exercise.js"), starter, "utf-8");
+        await fs9.writeFile(path8.join(exercisePath, "exercise.js"), starter, "utf-8");
         extractedFiles.push("exercise.js");
         hasStarterCode = true;
       }
@@ -40692,8 +40852,8 @@ async function extractExercise(input) {
           ...exerciseDeps
         }
       };
-      await fs8.writeFile(
-        path6.join(exercisePath, "package.json"),
+      await fs9.writeFile(
+        path8.join(exercisePath, "package.json"),
         JSON.stringify(pkgJson, null, 2),
         "utf-8"
       );
@@ -40705,20 +40865,20 @@ async function extractExercise(input) {
       );
       for (const [configFile, configContent] of Object.entries(scaffold.configs)) {
         if (!sandpackFileNames.has(configFile)) {
-          await fs8.writeFile(path6.join(exercisePath, configFile), configContent, "utf-8");
+          await fs9.writeFile(path8.join(exercisePath, configFile), configContent, "utf-8");
           extractedFiles.push(configFile);
         }
       }
       const setupSh = `#!/bin/sh
 ${scaffold.setupScript}
 `;
-      await fs8.writeFile(path6.join(exercisePath, "setup.sh"), setupSh, "utf-8");
+      await fs9.writeFile(path8.join(exercisePath, "setup.sh"), setupSh, "utf-8");
       extractedFiles.push("setup.sh");
     }
   }
   const readme = generateReadme(lessonData, exerciseTier);
-  const readmePath = path6.join(exercisePath, "README.md");
-  await fs8.writeFile(readmePath, readme, "utf-8");
+  const readmePath = path8.join(exercisePath, "README.md");
+  await fs9.writeFile(readmePath, readme, "utf-8");
   extractedFiles.push("README.md");
   return {
     exercisePath,
@@ -40789,9 +40949,9 @@ var init_workspace = __esm({
 
 // src/commands/workspace.ts
 import { Command as Command16 } from "commander";
-import path7 from "node:path";
-import os6 from "node:os";
-import fs9 from "node:fs/promises";
+import path9 from "node:path";
+import os7 from "node:os";
+import fs10 from "node:fs/promises";
 var logger12, workspaceCommand;
 var init_workspace2 = __esm({
   "src/commands/workspace.ts"() {
@@ -40803,7 +40963,7 @@ var init_workspace2 = __esm({
     workspaceCommand = new Command16("workspace").description(
       "Gerenciar workspace de estudo local"
     );
-    workspaceCommand.command("setup").description("Criar estrutura do workspace para o curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path7.join(os6.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
+    workspaceCommand.command("setup").description("Criar estrutura do workspace para o curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path9.join(os7.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
       try {
         await requireSession();
         const activeCourse = await requireActiveCourse();
@@ -40835,14 +40995,14 @@ Pr\xF3ximo passo: tostudy export
         process.exit(1);
       }
     });
-    workspaceCommand.command("status").description("Mostrar status do workspace do curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path7.join(os6.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
+    workspaceCommand.command("status").description("Mostrar status do workspace do curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path9.join(os7.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
       try {
         const activeCourse = await requireActiveCourse();
-        const courseSlug = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
-        const workspacePath = path7.join(opts.path, courseSlug);
+        const courseSlug2 = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
+        const workspacePath = path9.join(opts.path, courseSlug2);
         let configData = null;
         try {
-          const raw = await fs9.readFile(path7.join(workspacePath, ".ana-config.json"), "utf-8");
+          const raw = await fs10.readFile(path9.join(workspacePath, ".ana-config.json"), "utf-8");
           configData = JSON.parse(raw);
         } catch {
           process.stderr.write(
@@ -40850,42 +41010,42 @@ Pr\xF3ximo passo: tostudy export
           );
           process.exit(1);
         }
-        const exercisesDir = path7.join(workspacePath, "exercises");
+        const exercisesDir = path9.join(workspacePath, "exercises");
         let exerciseCount = 0;
         try {
-          const moduleDirs = await fs9.readdir(exercisesDir);
+          const moduleDirs = await fs10.readdir(exercisesDir);
           for (const modDir of moduleDirs) {
-            const modPath = path7.join(exercisesDir, modDir);
-            const stat = await fs9.stat(modPath);
+            const modPath = path9.join(exercisesDir, modDir);
+            const stat = await fs10.stat(modPath);
             if (stat.isDirectory()) {
-              const lessonDirs = await fs9.readdir(modPath);
+              const lessonDirs = await fs10.readdir(modPath);
               for (const lessonDir of lessonDirs) {
-                const lessonPath = path7.join(modPath, lessonDir);
-                const lstat = await fs9.stat(lessonPath);
+                const lessonPath = path9.join(modPath, lessonDir);
+                const lstat = await fs10.stat(lessonPath);
                 if (lstat.isDirectory()) exerciseCount++;
               }
             }
           }
         } catch {
         }
-        const generatedDir = path7.join(workspacePath, "generated");
+        const generatedDir = path9.join(workspacePath, "generated");
         let artifactCount = 0;
         try {
-          const files = await fs9.readdir(generatedDir);
+          const files = await fs10.readdir(generatedDir);
           artifactCount = files.length;
         } catch {
         }
-        const diagramsDir = path7.join(workspacePath, "diagrams");
+        const diagramsDir = path9.join(workspacePath, "diagrams");
         let diagramCount = 0;
         try {
-          const files = await fs9.readdir(diagramsDir);
+          const files = await fs10.readdir(diagramsDir);
           diagramCount = files.length;
         } catch {
         }
-        const vaultDir = path7.join(workspacePath, "vault");
+        const vaultDir = path9.join(workspacePath, "vault");
         let hasVault = false;
         try {
-          await fs9.access(path7.join(vaultDir, ".ana-vault.json"));
+          await fs10.access(path9.join(vaultDir, ".ana-vault.json"));
           hasVault = true;
         } catch {
         }
@@ -40929,19 +41089,8 @@ Pr\xF3ximo passo: tostudy export
 
 // src/commands/export.ts
 import { Command as Command17 } from "commander";
-import fs10 from "node:fs/promises";
-import path8 from "node:path";
-import os7 from "node:os";
-async function findWorkspacePath(courseTitle, basePath) {
-  const slug = courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
-  const candidate = path8.join(basePath, slug);
-  try {
-    const config2 = await fs10.readFile(path8.join(candidate, ".ana-config.json"), "utf-8");
-    if (config2) return candidate;
-  } catch {
-  }
-  return null;
-}
+import path10 from "node:path";
+import os8 from "node:os";
 var logger13, exportCommand;
 var init_export = __esm({
   "src/commands/export.ts"() {
@@ -40950,8 +41099,9 @@ var init_export = __esm({
     init_workspace();
     init_http2();
     init_session();
+    init_resolve();
     logger13 = createLogger("cli:export");
-    exportCommand = new Command17("export").description("Extrair exerc\xEDcio atual para o workspace local").option("--tier <tier>", "Tier do exerc\xEDcio: guided, semiGuided, challenging", "guided").option("--path <dir>", "Diret\xF3rio base do workspace", path8.join(os7.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
+    exportCommand = new Command17("export").description("Extrair exerc\xEDcio atual para o workspace local").option("--tier <tier>", "Tier do exerc\xEDcio: guided, semiGuided, challenging", "guided").option("--path <dir>", "Diret\xF3rio base do workspace", path10.join(os8.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
       try {
         const session = await requireSession();
         const activeCourse = await requireActiveCourse();
@@ -40961,8 +41111,8 @@ var init_export = __esm({
           process.stderr.write("\u274C Nenhuma li\xE7\xE3o ativa. Execute 'tostudy start' primeiro.\n");
           process.exit(1);
         }
-        const workspacePath = await findWorkspacePath(activeCourse.courseTitle, opts.path);
-        if (!workspacePath) {
+        const ws = await resolveWorkspace(activeCourse.courseTitle, opts.path);
+        if (!ws.found) {
           process.stderr.write(
             "\u274C Workspace n\xE3o encontrado. Execute 'tostudy workspace setup' primeiro.\n"
           );
@@ -40974,7 +41124,7 @@ var init_export = __esm({
         const result = await extractExercise({
           lessonData,
           exerciseTier: tier,
-          workspacePath
+          workspacePath: ws.workspacePath
         });
         if (opts.json) {
           process.stdout.write(JSON.stringify(result, null, 2) + "\n");
@@ -41008,13 +41158,13 @@ ${result.files.map((f) => `  \u{1F4C4} ${f}`).join("\n")}
 import { Command as Command18 } from "commander";
 import { execFile as execFile3 } from "node:child_process";
 import fs11 from "node:fs/promises";
-import path9 from "node:path";
-import os8 from "node:os";
-async function findWorkspacePath2(courseTitle, basePath) {
+import path11 from "node:path";
+import os9 from "node:os";
+async function findWorkspacePath(courseTitle, basePath) {
   const slug = courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
-  const candidate = path9.join(basePath, slug);
+  const candidate = path11.join(basePath, slug);
   try {
-    await fs11.access(path9.join(candidate, ".ana-config.json"));
+    await fs11.access(path11.join(candidate, ".ana-config.json"));
     return candidate;
   } catch {
     return null;
@@ -41027,10 +41177,10 @@ var init_open = __esm({
     init_src();
     init_session();
     logger14 = createLogger("cli:open");
-    openCommand = new Command18("open").description("Abrir workspace do curso na IDE").option("--path <dir>", "Diret\xF3rio base do workspace", path9.join(os8.homedir(), "study")).action(async (opts) => {
+    openCommand = new Command18("open").description("Abrir workspace do curso na IDE").option("--path <dir>", "Diret\xF3rio base do workspace", path11.join(os9.homedir(), "study")).action(async (opts) => {
       try {
         const activeCourse = await requireActiveCourse();
-        const workspacePath = await findWorkspacePath2(activeCourse.courseTitle, opts.path);
+        const workspacePath = await findWorkspacePath(activeCourse.courseTitle, opts.path);
         if (!workspacePath) {
           process.stderr.write(
             "\u274C Workspace n\xE3o encontrado. Execute 'tostudy workspace setup' primeiro.\n"
@@ -41077,23 +41227,23 @@ var init_types3 = __esm({
 
 // ../../packages/tostudy-core/src/vault/write-vault.ts
 import fs12 from "node:fs/promises";
-import path10 from "node:path";
-async function writeVaultFiles(files, outputPath, courseId, courseSlug) {
+import path12 from "node:path";
+async function writeVaultFiles(files, outputPath, courseId, courseSlug2) {
   for (const file2 of files) {
-    const fullPath = path10.join(outputPath, file2.relativePath);
-    await fs12.mkdir(path10.dirname(fullPath), { recursive: true });
+    const fullPath = path12.join(outputPath, file2.relativePath);
+    await fs12.mkdir(path12.dirname(fullPath), { recursive: true });
     await fs12.writeFile(fullPath, file2.content, "utf-8");
   }
-  const vaultPath = path10.join(outputPath, courseSlug);
+  const vaultPath = path12.join(outputPath, courseSlug2);
   const marker = {
     courseId,
-    courseSlug,
+    courseSlug: courseSlug2,
     generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     version: VAULT_MARKER_VERSION
   };
   await fs12.mkdir(vaultPath, { recursive: true });
   await fs12.writeFile(
-    path10.join(vaultPath, VAULT_MARKER_FILENAME),
+    path12.join(vaultPath, VAULT_MARKER_FILENAME),
     JSON.stringify(marker, null, 2),
     "utf-8"
   );
@@ -41118,8 +41268,8 @@ var init_vault = __esm({
 
 // src/commands/vault.ts
 import { Command as Command19 } from "commander";
-import path11 from "node:path";
-import os9 from "node:os";
+import path13 from "node:path";
+import os10 from "node:os";
 import fs13 from "node:fs/promises";
 var logger15, vaultCommand;
 var init_vault2 = __esm({
@@ -41132,15 +41282,15 @@ var init_vault2 = __esm({
     init_session();
     logger15 = createLogger("cli:vault");
     vaultCommand = new Command19("vault").description("Gerenciar vault Obsidian do curso");
-    vaultCommand.command("init").description("Gerar vault Obsidian para o curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path11.join(os9.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
+    vaultCommand.command("init").description("Gerar vault Obsidian para o curso ativo").option("--path <dir>", "Diret\xF3rio base do workspace", path13.join(os10.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
       try {
         const session = await requireSession();
         const activeCourse = await requireActiveCourse();
         const driftWarning = await checkCourseDrift();
         if (driftWarning) process.stderr.write(driftWarning + "\n");
-        const courseSlug = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
-        const workspacePath = path11.join(opts.path, courseSlug);
-        const vaultOutputPath = path11.join(workspacePath, "vault");
+        const courseSlug2 = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
+        const workspacePath = path13.join(opts.path, courseSlug2);
+        const vaultOutputPath = path13.join(workspacePath, "vault");
         const res = await fetch(`${session.apiUrl}/api/cli/vault/init`, {
           method: "POST",
           headers: {
@@ -41162,7 +41312,7 @@ var init_vault2 = __esm({
           data.files,
           vaultOutputPath,
           activeCourse.courseId,
-          courseSlug
+          courseSlug2
         );
         logger15.info("Vault generated", {
           courseId: activeCourse.courseId,
@@ -41203,16 +41353,16 @@ Para visualizar:
         process.exit(1);
       }
     });
-    vaultCommand.command("sync").description("Sincronizar progresso do curso com o vault local").option("--path <dir>", "Diret\xF3rio base do workspace", path11.join(os9.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
+    vaultCommand.command("sync").description("Sincronizar progresso do curso com o vault local").option("--path <dir>", "Diret\xF3rio base do workspace", path13.join(os10.homedir(), "study")).option("--json", "Output structured JSON").action(async (opts) => {
       try {
         const session = await requireSession();
         const activeCourse = await requireActiveCourse();
         const driftWarning = await checkCourseDrift();
         if (driftWarning) process.stderr.write(driftWarning + "\n");
-        const courseSlug = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
-        const vaultPath = path11.join(opts.path, courseSlug, "vault");
+        const courseSlug2 = activeCourse.courseTitle.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 60);
+        const vaultPath = path13.join(opts.path, courseSlug2, "vault");
         try {
-          await fs13.access(path11.join(vaultPath, ".ana-vault.json"));
+          await fs13.access(path13.join(vaultPath, ".ana-vault.json"));
         } catch {
           process.stderr.write("\u274C Vault n\xE3o encontrado. Execute 'tostudy vault init' primeiro.\n");
           process.exit(1);
@@ -41220,7 +41370,7 @@ Para visualizar:
         const data = createHttpProvider(session.apiUrl, session.token);
         const deps = { data, logger: logger15 };
         const progress3 = await getProgress({ enrollmentId: activeCourse.enrollmentId }, deps);
-        const markerPath = path11.join(vaultPath, ".ana-vault.json");
+        const markerPath = path13.join(vaultPath, ".ana-vault.json");
         const markerRaw = await fs13.readFile(markerPath, "utf-8");
         const marker = JSON.parse(markerRaw);
         marker.lastSyncedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -41230,7 +41380,7 @@ Para visualizar:
           currentLesson: progress3.currentLesson.title
         };
         await fs13.writeFile(markerPath, JSON.stringify(marker, null, 2), "utf-8");
-        const courseIndexPath = path11.join(vaultPath, courseSlug, "index.md");
+        const courseIndexPath = path13.join(vaultPath, courseSlug2, "index.md");
         try {
           let indexContent = await fs13.readFile(courseIndexPath, "utf-8");
           indexContent = indexContent.replace(/\n---\n\n> 📊 Progresso:.*\n/g, "");
@@ -41290,7 +41440,7 @@ __export(cli_exports, {
 import { Command as Command20 } from "commander";
 function createProgram() {
   const program2 = new Command20();
-  program2.name("tostudy").description("ToStudy CLI \u2014 study courses from the terminal").version(CLI_VERSION).option("--json", "Output structured JSON (for LLM agents)").option("--verbose", "Enable debug output").option("--course <id>", "Override active course ID");
+  program2.name("tostudy").description("ToStudy CLI \u2014 study courses from the terminal").version(CLI_VERSION).option("--verbose", "Enable debug output").option("--course <id>", "Override active course ID");
   program2.addCommand(setupCommand);
   program2.addCommand(doctorCommand);
   program2.addCommand(initCommand);
@@ -41335,7 +41485,7 @@ var init_cli = __esm({
     init_export();
     init_open();
     init_vault2();
-    CLI_VERSION = "0.5.0";
+    CLI_VERSION = "0.6.0";
   }
 });