ctx7 0.3.4 → 0.3.6

package/dist/index.js

@@ -123,6 +123,7 @@ var __dirname = dirname(fileURLToPath(import.meta.url));
 var pkg = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
 var VERSION = pkg.version;
 var NAME = pkg.name;
+var CLI_CLIENT_ID = "2veBSofhicRBguUT";
 
 // src/utils/api.ts
 var baseUrl = "https://context7.com";
@@ -810,6 +811,39 @@ function isTokenExpired(tokens) {
   }
   return Date.now() > tokens.expires_at - 6e4;
 }
+async function refreshAccessToken(refreshToken) {
+  const response = await fetch(`${getBaseUrl()}/api/oauth/token`, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "refresh_token",
+      client_id: CLI_CLIENT_ID,
+      refresh_token: refreshToken
+    }).toString()
+  });
+  if (!response.ok) {
+    const err = await response.json().catch(() => ({}));
+    throw new Error(err.error_description || err.error || "Failed to refresh token");
+  }
+  return await response.json();
+}
+async function getValidAccessToken() {
+  const tokens = loadTokens();
+  if (!tokens) return null;
+  if (!isTokenExpired(tokens)) {
+    return tokens.access_token;
+  }
+  if (!tokens.refresh_token) {
+    return null;
+  }
+  try {
+    const newTokens = await refreshAccessToken(tokens.refresh_token);
+    saveTokens(newTokens);
+    return newTokens.access_token;
+  } catch {
+    return null;
+  }
+}
 var CALLBACK_PORT = 52417;
 function createCallbackServer(expectedState) {
   let resolvePort;
@@ -953,7 +987,6 @@ function buildAuthorizationUrl(baseUrl3, clientId, redirectUri, codeChallenge, s
 import pc4 from "picocolors";
 import ora from "ora";
 import open from "open";
-var CLI_CLIENT_ID = "2veBSofhicRBguUT";
 var baseUrl2 = "https://context7.com";
 function setAuthBaseUrl(url) {
   baseUrl2 = url;
@@ -1029,18 +1062,13 @@ async function performLogin(openBrowser = true) {
 }
 async function loginCommand(options) {
   trackEvent("command", { name: "login" });
-  const existingTokens = loadTokens();
-  if (existingTokens) {
-    const expired = isTokenExpired(existingTokens);
-    if (!expired || existingTokens.refresh_token) {
-      console.log(pc4.yellow("You are already logged in."));
-      console.log(
-        pc4.dim("Run 'ctx7 logout' first if you want to log in with a different account.")
-      );
-      return;
-    }
-    clearTokens();
+  const existingToken = await getValidAccessToken();
+  if (existingToken) {
+    console.log(pc4.yellow("You are already logged in."));
+    console.log(pc4.dim("Run 'ctx7 logout' first if you want to log in with a different account."));
+    return;
   }
+  clearTokens();
   const token = await performLogin(options.browser);
   if (!token) {
     process.exit(1);
@@ -1058,29 +1086,30 @@ function logoutCommand() {
 }
 async function whoamiCommand() {
   trackEvent("command", { name: "whoami" });
-  const tokens = loadTokens();
-  if (!tokens) {
+  const accessToken = await getValidAccessToken();
+  if (!accessToken) {
     console.log(pc4.yellow("Not logged in."));
     console.log(pc4.dim("Run 'ctx7 login' to authenticate."));
     return;
   }
   console.log(pc4.green("Logged in"));
   try {
-    const userInfo = await fetchUserInfo(tokens.access_token);
-    if (userInfo.name) {
-      console.log(`${pc4.dim("Name:".padEnd(9))}${userInfo.name}`);
+    const whoami = await fetchWhoami(accessToken);
+    if (whoami.name) {
+      console.log(`${pc4.dim("Name:".padEnd(13))}${whoami.name}`);
     }
-    if (userInfo.email) {
-      console.log(`${pc4.dim("Email:".padEnd(9))}${userInfo.email}`);
+    if (whoami.email) {
+      console.log(`${pc4.dim("Email:".padEnd(13))}${whoami.email}`);
     }
-  } catch {
-    if (isTokenExpired(tokens) && !tokens.refresh_token) {
-      console.log(pc4.dim("(Session may be expired - run 'ctx7 login' to refresh)"));
+    if (whoami.teamspace) {
+      console.log(`${pc4.dim("Teamspace:".padEnd(13))}${whoami.teamspace.name}`);
     }
+  } catch {
+    console.log(pc4.dim("(Session may be expired - run 'ctx7 login' to refresh)"));
   }
 }
-async function fetchUserInfo(accessToken) {
-  const response = await fetch("https://clerk.context7.com/oauth/userinfo", {
+async function fetchWhoami(accessToken) {
+  const response = await fetch(`${getBaseUrl()}/api/dashboard/whoami`, {
     headers: {
       Authorization: `Bearer ${accessToken}`
     }
@@ -2584,8 +2613,7 @@ function registerSetupCommand(program2) {
   });
 }
 async function authenticateAndGenerateKey() {
-  const existingTokens = loadTokens();
-  const accessToken = existingTokens && !isTokenExpired(existingTokens) ? existingTokens.access_token : await performLogin();
+  const accessToken = await getValidAccessToken() ?? await performLogin();
   if (!accessToken) return null;
   const spinner = ora4("Configuring authentication...").start();
   try {
@@ -2625,15 +2653,15 @@ async function resolveMode(options) {
   return select3({
     message: "How should your agent access Context7?",
     choices: [
-      {
-        name: `CLI + Skills
-    ${pc8.dim("Installs a find-docs skill that guides your agent to fetch up-to-date library docs using ")}${pc8.dim(pc8.bold("ctx7"))}${pc8.dim(" CLI commands")}`,
-        value: "cli"
-      },
       {
         name: `MCP server
     ${pc8.dim("Agent calls Context7 tools via MCP protocol to retrieve up-to-date library docs")}`,
         value: "mcp"
+      },
+      {
+        name: `CLI + Skills
+    ${pc8.dim("Installs a find-docs skill that guides your agent to fetch up-to-date library docs using ")}${pc8.dim(pc8.bold("ctx7"))}${pc8.dim(" CLI commands")}`,
+        value: "cli"
       }
     ],
     theme: {
@@ -2651,8 +2679,8 @@ async function resolveCliAuth(apiKey) {
     log.plain(`${pc8.green("\u2714")} Authenticated`);
     return;
   }
-  const existingTokens = loadTokens();
-  if (existingTokens && !isTokenExpired(existingTokens)) {
+  const validToken = await getValidAccessToken();
+  if (validToken) {
     log.blank();
     log.plain(`${pc8.green("\u2714")} Authenticated`);
     return;
@@ -2798,6 +2826,7 @@ async function setupMcp(agents2, options, scope) {
   }
   log.blank();
   trackEvent("setup", { agents: agents2, scope, authMode: auth.mode });
+  trackEvent("install", { skills: ["/upstash/context7/context7-mcp"], ides: agents2 });
 }
 async function setupCli(options) {
   await resolveCliAuth(options.apiKey);
@@ -2835,6 +2864,7 @@ async function setupCli(options) {
   log.plain(`    Ask your agent: ${pc8.cyan(`"Use ctx7 CLI to look up React hooks"`)}`);
   log.blank();
   trackEvent("setup", { mode: "cli" });
+  trackEvent("install", { skills: ["/upstash/context7/find-docs"], ides: targets.ides });
 }
 async function setupCommand(options) {
   trackEvent("command", { name: "setup" });