@floomhq/skills 0.2.3 → 0.2.5

package/dist/index.js

@@ -2360,12 +2360,17 @@ import { join as join3 } from "node:path";
 import { mkdir as mkdir2, readFile as readFile3, writeFile, chmod } from "node:fs/promises";
 var CONFIG_DIR = join3(homedir2(), ".floom");
 var AUTH_FILE = join3(CONFIG_DIR, "auth.json");
-var DEFAULT_APP_URL = "https://floom.dev";
-var DEFAULT_API_URL = "https://floom-v0.vercel.app/api/v1";
+var DEFAULT_APP_URL = "https://skills.floom.dev";
+var DEFAULT_API_URL = "https://skills.floom.dev/api/v1";
+var LEGACY_API_HOSTS = /* @__PURE__ */ new Set(["floom-v0.vercel.app"]);
 async function ensureDir() {
   await mkdir2(CONFIG_DIR, { recursive: true, mode: 448 });
 }
 async function readAuth() {
+  const parsed = await readRawAuth();
+  return parsed ? { ...parsed, apiUrl: normalizeApiUrl(parsed.apiUrl) } : null;
+}
+async function readRawAuth() {
   try {
     const raw = await readFile3(AUTH_FILE, "utf8");
     return JSON.parse(raw);
@@ -2376,7 +2381,7 @@ async function readAuth() {
 }
 async function writeAuth(state) {
   await ensureDir();
-  await writeFile(AUTH_FILE, JSON.stringify(state, null, 2), { mode: 384 });
+  await writeFile(AUTH_FILE, JSON.stringify({ ...state, apiUrl: normalizeApiUrl(state.apiUrl) }, null, 2), { mode: 384 });
   try {
     await chmod(AUTH_FILE, 384);
   } catch {
@@ -2399,15 +2404,33 @@ function getAppUrl() {
 }
 function getApiBaseUrls(preferred) {
   const explicitApiUrl = process.env.FLOOM_API_URL?.trim();
-  if (explicitApiUrl) return [explicitApiUrl.replace(/\/$/, "")];
-  const primary = (preferred ?? getApiUrl()).replace(/\/$/, "");
+  if (explicitApiUrl) return [normalizeApiUrl(explicitApiUrl)];
+  const primary = normalizeApiUrl(preferred ?? getApiUrl());
   const bases = [primary];
   if (preferred && !process.env.FLOOM_APP_URL) bases.push(DEFAULT_API_URL);
   return Array.from(new Set(bases));
 }
+function normalizeApiUrl(apiUrl) {
+  const trimmed = apiUrl.replace(/\/$/, "");
+  try {
+    const url = new URL(trimmed);
+    if (LEGACY_API_HOSTS.has(url.hostname)) return DEFAULT_API_URL;
+  } catch {
+    return DEFAULT_API_URL;
+  }
+  return trimmed;
+}
+function isLegacyApiUrl(apiUrl) {
+  if (!apiUrl) return false;
+  try {
+    return LEGACY_API_HOSTS.has(new URL(apiUrl).hostname);
+  } catch {
+    return false;
+  }
+}
 
 // src/version.ts
-var VERSION = "0.2.3";
+var VERSION = "0.2.5";
 
 // src/api-client.ts
 var DEFAULT_TIMEOUT_MS = 2e4;
@@ -2431,7 +2454,8 @@ async function fetchWithTimeout(url, init = {}) {
 }
 async function api(path, opts = {}) {
   const auth = await readAuth();
-  if (opts.authRequired && !auth) {
+  const token = process.env.FLOOM_API_TOKEN?.trim() || auth?.token;
+  if (opts.authRequired && !token) {
     throw new FloomError("AUTH_REQUIRED", "Not logged in. Run: floom login");
   }
   let lastError = null;
@@ -2448,7 +2472,7 @@ async function api(path, opts = {}) {
       "User-Agent": `floom-cli/${VERSION}`,
       "x-floom-cli-version": VERSION
     };
-    if (auth) headers.Authorization = `Bearer ${auth.token}`;
+    if (token) headers.Authorization = `Bearer ${token}`;
     let res;
     try {
       res = await fetchWithTimeout(url.toString(), {
@@ -2594,22 +2618,25 @@ async function logoutCommand() {
 // src/commands/whoami.ts
 async function whoamiCommand() {
   const auth = await readAuth();
-  if (!auth) {
+  const envToken = process.env.FLOOM_API_TOKEN?.trim();
+  if (!auth && !envToken) {
     log.info("Not logged in. Run: floom login");
     return;
   }
+  let me;
   try {
-    await api("/me", { authRequired: true });
+    me = await api("/me", { authRequired: true });
   } catch (e) {
-    log.err(`Stored login is not accepted by the Floom API: ${e.message}`);
+    log.err(`Login is not accepted by the Floom API: ${e.message}`);
     log.info("Run: floom login");
     process.exitCode = 1;
     return;
   }
   log.heading("Logged in as:");
-  log.kv("handle", `@${auth.handle}`);
-  log.kv("email", auth.email);
-  log.kv("api url", auth.apiUrl);
+  log.kv("handle", `@${me.user.handle}`);
+  log.kv("email", me.user.email);
+  log.kv("api url", process.env.FLOOM_API_URL ?? auth?.apiUrl ?? "default");
+  if (envToken) log.kv("auth", "FLOOM_API_TOKEN");
 }
 
 // src/commands/init.ts
@@ -3516,6 +3543,22 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 function textOf(result) {
   return String(result?.content?.[0]?.text ?? "");
 }
+function toolError(result) {
+  const text = textOf(result);
+  if (result?.isError) return text || "tool returned an MCP error";
+  if (/authentication required|forbidden|not found|invalid token/i.test(text)) return text;
+  return null;
+}
+function jsonArrayLength(result, key) {
+  if (toolError(result)) return null;
+  try {
+    const parsed = JSON.parse(textOf(result));
+    const value = parsed?.[key];
+    return Array.isArray(value) ? value.length : null;
+  } catch {
+    return null;
+  }
+}
 function pass(name, detail) {
   return { name, ok: true, detail };
 }
@@ -3528,7 +3571,25 @@ function fail(name, detail) {
 async function doctorCommand(opts = {}) {
   if (!opts.freshAgent) {
     const auth2 = await readAuth();
-    const checks2 = [pass("cli_version", VERSION), auth2?.token ? pass("auth", `@${auth2.handle}`) : fail("auth", "not logged in")];
+    const rawAuth = await readRawAuth();
+    let authCheck;
+    const envToken = process.env.FLOOM_API_TOKEN?.trim();
+    if (!auth2?.token && !envToken) {
+      authCheck = fail("auth", "not logged in");
+    } else {
+      try {
+        const me = await api("/me", { authRequired: true });
+        const authSource = envToken ? "FLOOM_API_TOKEN" : "~/.floom/auth.json";
+        authCheck = pass("auth", `@${me.user.handle} via ${authSource}`);
+      } catch (e) {
+        authCheck = fail("auth", `saved login rejected by API: ${e.message}`);
+      }
+    }
+    const checks2 = [
+      pass("cli_version", VERSION),
+      authCheck,
+      process.env.FLOOM_API_URL ? isLegacyApiUrl(process.env.FLOOM_API_URL) ? warn("api_url", `legacy FLOOM_API_URL ${process.env.FLOOM_API_URL}; using ${DEFAULT_API_URL}`) : pass("api_url", process.env.FLOOM_API_URL) : isLegacyApiUrl(rawAuth?.apiUrl) ? warn("auth_api_url", `legacy URL in ~/.floom/auth.json; using ${DEFAULT_API_URL}`) : pass("api_url", auth2?.apiUrl ?? DEFAULT_API_URL)
+    ];
     emitDoctor(checks2, opts.json);
     if (checks2.some((check) => !check.ok)) process.exit(1);
     return;
@@ -3557,7 +3618,7 @@ async function doctorCommand(opts = {}) {
       HOME: tmpHome,
       FLOOM_SKILLS_DIR: tmpSkills,
       ...token ? { FLOOM_API_TOKEN: token } : {},
-      ...auth?.apiUrl ? { FLOOM_API_URL: auth.apiUrl } : {}
+      ...process.env.FLOOM_API_URL ? { FLOOM_API_URL: normalizeApiUrl(process.env.FLOOM_API_URL) } : auth?.apiUrl ? { FLOOM_API_URL: auth.apiUrl } : {}
     },
     stderr: "pipe"
   });
@@ -3575,10 +3636,23 @@ async function doctorCommand(opts = {}) {
       return;
     }
     const workspaces = await client.callTool({ name: "list_workspaces", arguments: {} });
-    checks.push(textOf(workspaces).length > 0 ? pass("mcp_list_workspaces", `${textOf(workspaces).length} chars`) : fail("mcp_list_workspaces", "empty response"));
+    const workspaceError = toolError(workspaces);
+    const workspaceCount = jsonArrayLength(workspaces, "libraries");
+    const workspacesOk = !workspaceError && workspaceCount !== null;
+    checks.push(workspacesOk ? pass("mcp_list_workspaces", `${workspaceCount} workspaces`) : fail("mcp_list_workspaces", workspaceError ?? "unexpected response shape"));
     const search = await client.callTool({ name: "search_skills", arguments: { query: opts.query ?? "pdf" } });
-    checks.push(textOf(search).length > 0 ? pass("mcp_search_skills", `${textOf(search).length} chars`) : fail("mcp_search_skills", "empty response"));
+    const searchError = toolError(search);
+    const skillCount = jsonArrayLength(search, "skills");
+    const searchOk = !searchError && skillCount !== null;
+    checks.push(searchOk ? pass("mcp_search_skills", `${skillCount} skills`) : fail("mcp_search_skills", searchError ?? "unexpected response shape"));
     if (opts.ref) {
+      if (!workspacesOk || !searchOk) {
+        checks.push(warn("mcp_get_skill", "skipped because authenticated MCP API prechecks failed"));
+        checks.push(warn("mcp_install_skill", "skipped because authenticated MCP API prechecks failed"));
+        emitDoctor(checks, opts.json);
+        if (checks.some((check) => !check.ok)) process.exit(1);
+        return;
+      }
       const skill = await client.callTool({ name: "get_skill", arguments: { ref: opts.ref } });
       checks.push(/SKILL\.md/.test(textOf(skill)) ? pass("mcp_get_skill", opts.ref) : fail("mcp_get_skill", "bundle did not include SKILL.md"));
       const installed = await client.callTool({ name: "install_skill", arguments: { ref: opts.ref, target: opts.target ?? "codex" } });