@tostudy-ai/cli 0.18.11 → 0.18.16

package/dist/main.js

@@ -1842,12 +1842,30 @@ var init_formatter = __esm({
   }
 });
 
+// src/io/has-binary.ts
+import { execFileSync } from "node:child_process";
+function locatorCommand() {
+  return process.platform === "win32" ? "where" : "which";
+}
+function hasBinary(name) {
+  try {
+    execFileSync(locatorCommand(), [name], { encoding: "utf-8", stdio: "pipe", timeout: 3e3 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+var init_has_binary = __esm({
+  "src/io/has-binary.ts"() {
+    "use strict";
+  }
+});
+
 // src/installer/ide-detector.ts
 var ide_detector_exports = {};
 __export(ide_detector_exports, {
   detectIDEs: () => detectIDEs
 });
-import { execFileSync } from "node:child_process";
 import fs3 from "node:fs";
 import path4 from "node:path";
 import os3 from "node:os";
@@ -1937,11 +1955,7 @@ function detectIDEs(home = os3.homedir()) {
   ];
   const claudeIde = ides.find((ide) => ide.id === "claude-code");
   if (claudeIde) {
-    try {
-      execFileSync("which", ["claude"], { encoding: "utf-8" });
-      claudeIde.detected = true;
-    } catch {
-    }
+    claudeIde.detected = hasBinary("claude");
   }
   for (const [id, bin] of [
     ["grok", "grok"],
@@ -1949,11 +1963,7 @@ function detectIDEs(home = os3.homedir()) {
   ]) {
     const ide = ides.find((i) => i.id === id);
     if (ide && !ide.detected) {
-      try {
-        execFileSync("which", [bin], { encoding: "utf-8" });
-        ide.detected = true;
-      } catch {
-      }
+      ide.detected = hasBinary(bin);
     }
   }
   return ides;
@@ -1961,6 +1971,7 @@ function detectIDEs(home = os3.homedir()) {
 var init_ide_detector = __esm({
   "src/installer/ide-detector.ts"() {
     "use strict";
+    init_has_binary();
   }
 });
 
@@ -2333,14 +2344,6 @@ __export(runtime_registry_exports, {
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname, join as join2 } from "node:path";
-function hasBinary(name) {
-  try {
-    execFileSync2("which", [name], { encoding: "utf-8", stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
 function writeFile2(absDir, fileName, body) {
   mkdirSync2(absDir, { recursive: true });
   writeFileSync2(join2(absDir, fileName), body);
@@ -2402,10 +2405,10 @@ ${content}`;
 function detectedSlashHints(slug, home, cwd) {
   return RUNTIMES.filter((r) => r.slashHint && r.detect(home, cwd)).map((r) => r.slashHint(slug));
 }
-function slashHintLines(slug, home, cwd, fallbackCommand) {
+function slashHintLines(slug, home, cwd) {
   const hints = slug ? detectedSlashHints(slug, home, cwd) : [];
   if (hints.length > 0) return hints.map((h) => `\u2192 ${h}`);
-  return [`\u2192 Na sua plataforma, digite: ${fallbackCommand}`];
+  return ["\u2192 Na sua plataforma, pe\xE7a: vamos estudar (no terminal: tostudy menu)"];
 }
 function needsRootAgentsConsent(cwd) {
   const filePath = join2(cwd, "AGENTS.md");
@@ -2425,7 +2428,7 @@ function upsertRootAgentsBlock(cwd, ctx) {
     "",
     `- **Course:** ${ctx.courseTitle} (${ctx.progress}% complete)`,
     `- Read \`.tostudy/courses/${slug}/AGENTS.md\` for the full tutor instructions.`,
-    "- Study commands: run `/tostudy` (or `tostudy menu` in the terminal).",
+    '- To study, ask in plain language (e.g. "vamos estudar"). In Claude Code or OpenCode you can also run `/tostudy`; in the terminal, `tostudy menu`.',
     "",
     "<!-- tostudy:end -->"
   ].join("\n");
@@ -2467,6 +2470,7 @@ var init_runtime_registry = __esm({
     "use strict";
     init_dist();
     init_slug();
+    init_has_binary();
     init_instruction_template_v3();
     logger2 = createLogger("cli:runtime-registry");
     detectOpencode = (home) => existsSync2(join2(home, ".opencode")) || existsSync2(join2(home, ".config", "opencode"));
@@ -2518,7 +2522,10 @@ var init_runtime_registry = __esm({
           const file2 = join2(home, ".codex", "prompts", "tostudy.md");
           writeFile2(join2(home, ".codex", "prompts"), "tostudy.md", content);
           return [file2];
-        }
+        },
+        // GH-2351: Codex never reads ~/.codex/prompts, so there is no /tostudy there;
+        // asking in plain language works (it reads AGENTS.md and finds the course skill).
+        slashHint: () => "No Codex, abra o Codex e pe\xE7a: vamos estudar"
       },
       {
         id: "opencode",
@@ -3735,27 +3742,57 @@ import { Command as Command3 } from "commander";
 
 // src/installer/mcp-setup.ts
 import { spawn } from "node:child_process";
-async function exchangeCliSessionForMcpToken(session, fetchImpl = fetch) {
-  const res = await fetchImpl(`${session.apiUrl}/api/mcp/token`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${session.token}`
-    }
-  });
+import { hostname } from "node:os";
+
+// src/version.ts
+var CLI_VERSION = true ? "0.18.16" : "0.7.1";
+
+// src/installer/mcp-setup.ts
+function safeServerError(text2) {
+  if (typeof text2 !== "string" || text2.length === 0 || text2.length > 200) return null;
+  return ["Bearer", "mcp_", "eyJ"].some((m) => text2.includes(m)) ? null : text2;
+}
+async function createMcpApiKey(session, fetchImpl = fetch) {
+  let res;
+  try {
+    res = await fetchImpl(`${session.apiUrl}/api/mcp/sessions`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${session.token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        clientInfo: {
+          source: "tostudy-cli-setup",
+          hostname: hostname(),
+          os: process.platform,
+          version: CLI_VERSION
+        }
+      })
+    });
+  } catch {
+    throw new Error("Falha ao criar a chave MCP: erro de rede");
+  }
   if (!res.ok) {
     const body = await res.json().catch(() => ({}));
-    throw new Error(body.error ?? `Falha ao obter token MCP (${res.status})`);
+    throw new Error(
+      `Falha ao criar a chave MCP: ${safeServerError(body.error) ?? `HTTP ${res.status}`}`
+    );
+  }
+  const { apiKey } = await res.json().catch(() => ({}));
+  if (typeof apiKey !== "string" || !apiKey.startsWith("mcp_")) {
+    throw new Error("Falha ao criar a chave MCP: resposta inv\xE1lida do servidor");
   }
-  return res.json();
+  return apiKey;
 }
-async function runMcpSetup(session, token, spawnImpl = spawn) {
+async function runMcpSetup(session, apiKey, spawnImpl = spawn) {
   const command = process.platform === "win32" ? "npx.cmd" : "npx";
   await new Promise((resolve, reject) => {
     const child = spawnImpl(command, ["-y", "@tostudy-ai/mcp-setup", "--url", session.apiUrl], {
       stdio: "inherit",
       env: {
         ...process.env,
-        TOSTUDY_API_KEY: token
+        TOSTUDY_API_KEY: apiKey
       }
     });
     child.once("error", reject);
@@ -3790,8 +3827,15 @@ async function runSetupMcpSubcommand() {
   const session = await requireSession();
   console.log(`  \u2713 Logado como ${session.userName}
 `);
-  const { token } = await exchangeCliSessionForMcpToken(session);
-  await runMcpSetup(session, token);
+  const apiKey = await createMcpApiKey(session);
+  try {
+    await runMcpSetup(session, apiKey);
+  } catch (error49) {
+    console.error(
+      "  Instala\xE7\xE3o incompleta: a chave MCP criada aparece em Configura\xE7\xF5es \u203A MCP e pode ser revogada."
+    );
+    throw error49;
+  }
   console.log("\n  Setup MCP completo!");
   console.log("  \u2192 Reinicie o IDE para ativar o servidor MCP");
   console.log("  \u2192 tostudy doctor  (verificar conex\xE3o)\n");
@@ -3845,9 +3889,6 @@ init_session_store();
 init_workspace_state();
 init_formatter();
 
-// src/version.ts
-var CLI_VERSION = true ? "0.18.11" : "0.7.1";
-
 // src/update-checker.ts
 init_config_dir();
 import fs8 from "node:fs";
@@ -5206,7 +5247,6 @@ var selectCommand = new Command8("select").description("Activate a course by ID
         { json: true }
       );
     } else {
-      const slashCmd = courseSlug2 ? `/tostudy-${courseSlug2}` : "/tostudy";
       const home = os7.homedir();
       const cwd = process.cwd();
       const namespacedPath = `${cwd}/.tostudy`;
@@ -5238,7 +5278,7 @@ var selectCommand = new Command8("select").description("Activate a course by ID
         lines.push(rootAgentsSkippedHint());
       }
       lines.push("", "\u2192 Abra sua plataforma (claude, codex, cursor...)");
-      lines.push(...slashHintLines(courseSlug2, home, cwd, slashCmd));
+      lines.push(...slashHintLines(courseSlug2, home, cwd));
       lines.push("\u2192 Em outras plataformas: tostudy init");
       output(lines.join("\n"), { json: false });
     }
@@ -5927,7 +5967,7 @@ __export(external_exports, {
   guid: () => guid2,
   hash: () => hash,
   hex: () => hex2,
-  hostname: () => hostname2,
+  hostname: () => hostname3,
   httpUrl: () => httpUrl,
   includes: () => _includes,
   instanceof: () => _instanceof,
@@ -7314,7 +7354,7 @@ __export(regexes_exports, {
   extendedDuration: () => extendedDuration,
   guid: () => guid,
   hex: () => hex,
-  hostname: () => hostname,
+  hostname: () => hostname2,
   html5Email: () => html5Email,
   idnEmail: () => idnEmail,
   integer: () => integer,
@@ -7391,7 +7431,7 @@ var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]
 var cidrv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|::|([0-9a-fA-F]{1,4})?::([0-9a-fA-F]{1,4}:?){0,6})\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])$/;
 var base64 = /^$|^(?:[0-9a-zA-Z+/]{4})*(?:(?:[0-9a-zA-Z+/]{2}==)|(?:[0-9a-zA-Z+/]{3}=))?$/;
 var base64url = /^[A-Za-z0-9_-]*$/;
-var hostname = /^(?=.{1,253}\.?$)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[-0-9a-zA-Z]{0,61}[0-9a-zA-Z])?)*\.?$/;
+var hostname2 = /^(?=.{1,253}\.?$)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[-0-9a-zA-Z]{0,61}[0-9a-zA-Z])?)*\.?$/;
 var domain = /^([a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
 var e164 = /^\+[1-9]\d{6,14}$/;
 var dateSource = `(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))`;
@@ -17761,7 +17801,7 @@ __export(schemas_exports2, {
   guid: () => guid2,
   hash: () => hash,
   hex: () => hex2,
-  hostname: () => hostname2,
+  hostname: () => hostname3,
   httpUrl: () => httpUrl,
   instanceof: () => _instanceof,
   int: () => int,
@@ -18265,7 +18305,7 @@ var ZodCustomStringFormat = /* @__PURE__ */ $constructor("ZodCustomStringFormat"
 function stringFormat(format, fnOrRegex, _params = {}) {
   return _stringFormat(ZodCustomStringFormat, format, fnOrRegex, _params);
 }
-function hostname2(_params) {
+function hostname3(_params) {
   return _stringFormat(ZodCustomStringFormat, "hostname", regexes_exports.hostname, _params);
 }
 function hex2(_params) {
@@ -20190,8 +20230,9 @@ var menuCommand = new Command18("menu").description("Show available commands and
     } else {
       lines.push(
         "  Curso ativo: (nenhum)",
-        "  \u2192 tostudy courses   para ver seus cursos",
+        "  \u2192 tostudy courses          para ver seus cursos",
         "  \u2192 tostudy select <n\xFAmero>  para ativar um curso",
+        "  \u2192 tostudy suggest          se voc\xEA ainda n\xE3o tem nenhum curso",
         ""
       );
     }