@dosu/cli 0.2.0 → 0.3.1

package/bin/dosu.js

@@ -2115,6 +2115,7 @@ function emptyConfig() {
     expires_at: 0
   };
 }
+var MODE_OSS = "oss";
 var init_config = () => {};
 
 // src/config/constants.ts
@@ -2137,6 +2138,9 @@ import { dirname } from "node:path";
 function mcpURL(deploymentID) {
   return `${getBackendURL()}/v1/mcp/deployments/${deploymentID}`;
 }
+function mcpBaseURL() {
+  return `${getBackendURL()}/v1/mcp`;
+}
 function mcpHeaders(apiKey) {
   return { "X-Dosu-API-Key": apiKey };
 }
@@ -2277,6 +2281,11 @@ function createJSONProvider(opts) {
     url: mcpURL(cfg.deployment_id),
     headers: mcpHeaders(cfg.api_key)
   });
+  const defaultBuildOSSServer = (cfg) => ({
+    type: "http",
+    url: mcpBaseURL(),
+    headers: mcpHeaders(cfg.api_key)
+  });
   const buildServer = opts.buildServer ?? defaultBuildServer;
   return {
     name: () => opts.providerName,
@@ -2288,7 +2297,7 @@ function createJSONProvider(opts) {
     globalConfigPath: () => expandHome(opts.globalPath),
     isConfigured: () => isJSONKeyConfigured(expandHome(opts.globalPath), opts.topKey),
     install(cfg, global) {
-      if (!cfg.deployment_id)
+      if (cfg.mode !== MODE_OSS && !cfg.deployment_id)
         throw new Error("deployment ID is required");
       let configPath;
       if (global) {
@@ -2298,7 +2307,8 @@ function createJSONProvider(opts) {
       } else {
         throw new Error(`${opts.providerName} does not support local installation`);
       }
-      installJSONServer(configPath, opts.topKey, buildServer(cfg));
+      const serverBuilder = cfg.mode === MODE_OSS ? defaultBuildOSSServer : buildServer;
+      installJSONServer(configPath, opts.topKey, serverBuilder(cfg));
     },
     remove(global) {
       let configPath;
@@ -2314,6 +2324,7 @@ function createJSONProvider(opts) {
   };
 }
 var init_base = __esm(() => {
+  init_config();
   init_config_helpers();
   init_detect();
 });
@@ -3626,7 +3637,7 @@ class Client {
       options.body = JSON.stringify(body);
     }
     const controller = new AbortController;
-    const timeout = setTimeout(() => controller.abort(), 30000);
+    const timeout = setTimeout(() => controller.abort(), 1e4);
     options.signal = controller.signal;
     try {
       return await fetch(url, options);
@@ -3864,6 +3875,7 @@ async function startCallbackServer() {
     const refreshToken = url.searchParams.get("refresh_token");
     const expiresIn = url.searchParams.get("expires_in");
     const email = url.searchParams.get("email");
+    const mode = url.searchParams.get("mode");
     if (!accessToken) {
       res.writeHead(200, { "Content-Type": "text/html" });
       res.end(CALLBACK_HTML_EXTRACT);
@@ -3879,7 +3891,8 @@ async function startCallbackServer() {
       access_token: accessToken,
       refresh_token: refreshToken && refreshToken !== "null" ? refreshToken : "",
       expires_in: expiresInInt,
-      email: email ?? undefined
+      email: email ?? undefined,
+      ...mode === MODE_OSS && { mode: MODE_OSS }
     });
     res.writeHead(200, { "Content-Type": "text/html" });
     res.end(buildSuccessHtml(email ?? undefined));
@@ -3961,6 +3974,9 @@ if (hash) {
 </script>
 </body>
 </html>`;
+var init_server = __esm(() => {
+  init_config();
+});
 
 // node_modules/is-docker/index.js
 import fs from "node:fs";
@@ -4507,16 +4523,16 @@ var exports_flow = {};
 __export(exports_flow, {
   startOAuthFlow: () => startOAuthFlow
 });
-async function startOAuthFlow(signal) {
+async function startOAuthFlow(signal, path2 = "/cli/auth") {
   const { server, tokenPromise } = await startCallbackServer();
   let timeoutId;
   try {
     const callbackURL = `http://localhost:${server.port}/callback`;
-    const authURL = buildAuthURL(callbackURL);
+    const authURL = buildAuthURL(callbackURL, path2);
     const open2 = await Promise.resolve().then(() => (init_open(), exports_open));
     await open2.default(authURL);
     const timeout = new Promise((_3, reject) => {
-      timeoutId = setTimeout(() => reject(new Error("authentication timeout - please try again")), 300000);
+      timeoutId = setTimeout(() => reject(new Error("authentication timeout - please try again")), 900000);
     });
     const abort = signal ? new Promise((_3, reject) => {
       signal.addEventListener("abort", () => reject(new Error("authentication cancelled")));
@@ -4527,12 +4543,17 @@ async function startOAuthFlow(signal) {
     server.close();
   }
 }
-function buildAuthURL(callbackURL) {
+function buildAuthURL(callbackURL, path2) {
   const webAppURL = getWebAppURL();
   const params = new URLSearchParams({ callback: callbackURL });
-  return `${webAppURL}/cli/auth?${params}`;
+  if (path2 !== "/cli/auth") {
+    params.set("redirect", `${path2}?callback=${encodeURIComponent(callbackURL)}`);
+  }
+  return `${webAppURL}${path2}?${params}`;
 }
-var init_flow = () => {};
+var init_flow = __esm(() => {
+  init_server();
+});
 
 // src/setup/flow.ts
 var exports_flow2 = {};
@@ -4545,16 +4566,22 @@ __export(exports_flow2, {
 });
 async function runSetup(opts = {}) {
   Ie("Dosu CLI Setup");
-  const cfg = await stepAuthenticate();
+  const cfg = await stepAuthenticate(opts);
   if (!cfg)
     return;
   const apiClient = new Client(cfg);
-  let deployment;
   if (opts.deploymentID) {
     const d3 = await stepResolveDeployment(apiClient, opts.deploymentID);
     if (!d3)
       return;
-    deployment = d3;
+    cfg.deployment_id = d3.deployment_id;
+    cfg.deployment_name = d3.name;
+  } else if (cfg.mode === MODE_OSS) {
+    const deployments = await fetchDeployments(apiClient);
+    if (deployments.length > 0) {
+      cfg.deployment_id = deployments[0].deployment_id;
+      cfg.deployment_name = deployments[0].name;
+    }
   } else {
     const org = await stepSelectOrg(apiClient);
     if (!org)
@@ -4562,10 +4589,9 @@ async function runSetup(opts = {}) {
     const d3 = await stepSelectDeployment(apiClient, org);
     if (!d3)
       return;
-    deployment = d3;
+    cfg.deployment_id = d3.deployment_id;
+    cfg.deployment_name = d3.name;
   }
-  cfg.deployment_id = deployment.deployment_id;
-  cfg.deployment_name = deployment.name;
   saveConfig(cfg);
   const apiKey = await stepMintAPIKey(apiClient, cfg);
   if (!apiKey)
@@ -4582,10 +4608,14 @@ Run ${info("dosu mcp add <tool>")} to manually configure a tool.`);
   if (!selection)
     return;
   const results = stepConfigureTools(cfg, selection);
-  stepShowSummary(results);
-  Se("\uD83C\uDF89 Setup complete!");
+  stepShowSummary(results, cfg.mode);
+  if (cfg.mode === MODE_OSS) {
+    Se("Setup complete! Using open-source libraries only.\nRun `dosu setup` again to connect your own repos.");
+  } else {
+    Se("\uD83C\uDF89 Setup complete!");
+  }
 }
-async function stepAuthenticate() {
+async function stepAuthenticate(opts) {
   const cfg = loadConfig();
   if (cfg.access_token) {
     const s = Y2();
@@ -4595,6 +4625,21 @@ async function stepAuthenticate() {
       const resp = await apiClient.doRequestRaw("GET", "/v1/mcp/deployments");
       if (resp.status === 200) {
         s.stop("Authenticated");
+        if (!opts.deploymentID && cfg.mode === MODE_OSS) {
+          const modeLabel = "open-source libraries only";
+          const action = await ve({
+            message: `Currently configured for ${modeLabel}. What would you like to do?`,
+            options: [
+              { label: "Reconfigure (opens browser)", value: "reconfigure" },
+              { label: "Keep current setup and update tools", value: "keep" }
+            ]
+          });
+          if (pD(action))
+            return null;
+          if (action === "keep")
+            return cfg;
+          return await openBrowserForSetup(cfg, opts);
+        }
         return cfg;
       }
       try {
@@ -4614,15 +4659,21 @@ async function stepAuthenticate() {
   const shouldLogin = await ye({ message: "Open browser to log in?" });
   if (pD(shouldLogin) || !shouldLogin)
     return null;
+  return await openBrowserForSetup(cfg, opts);
+}
+async function openBrowserForSetup(cfg, opts) {
   try {
     const { startOAuthFlow: startOAuthFlow2 } = await Promise.resolve().then(() => (init_flow(), exports_flow));
     const s = Y2();
     s.start("Waiting for authentication...");
-    const token = await startOAuthFlow2();
+    const authPath = opts.deploymentID ? "/cli/auth" : "/cli/setup";
+    const token = await startOAuthFlow2(undefined, authPath);
     s.stop("Authenticated");
     cfg.access_token = token.access_token;
     cfg.refresh_token = token.refresh_token;
     cfg.expires_at = Math.floor(Date.now() / 1000) + token.expires_in;
+    if (token.mode === MODE_OSS)
+      cfg.mode = MODE_OSS;
     saveConfig(cfg);
     return cfg;
   } catch (err) {
@@ -4630,6 +4681,13 @@ async function stepAuthenticate() {
     return null;
   }
 }
+async function fetchDeployments(apiClient) {
+  try {
+    return await apiClient.getDeployments();
+  } catch {
+    return [];
+  }
+}
 async function stepSelectOrg(apiClient) {
   try {
     const orgs = await apiClient.getOrgs();
@@ -4700,6 +4758,10 @@ ${dim(deployments[0].name)}`);
   }
 }
 async function stepMintAPIKey(apiClient, cfg) {
+  if (!cfg.deployment_id) {
+    M2.error("No deployment available for API key creation");
+    return null;
+  }
   if (cfg.api_key) {
     const valid = await apiClient.validateAPIKey(cfg.api_key, cfg.deployment_id);
     if (valid) {
@@ -4787,7 +4849,7 @@ function stepConfigureTools(cfg, selection) {
   }
   return results;
 }
-function stepShowSummary(results) {
+function stepShowSummary(results, mode) {
   const installed = results.filter((r) => r.action === "install" && !r.error);
   const removed = results.filter((r) => r.action === "remove" && !r.error);
   const skipped = results.filter((r) => r.action === "skip");
@@ -4809,9 +4871,10 @@ ${lines}`);
     M2.success("All tools already configured. No changes needed.");
   }
   if (installed.length > 0 || skipped.length > 0) {
+    const prompt = mode === MODE_OSS ? `What can I do with the Dosu MCP?` : `Use Dosu to search our team's documentation and answer: what are the main components of our system?`;
     M2.message(`Try it out! Paste this into your agent:
 
-` + info(`Use Dosu to search our team's documentation and answer: what are the main components of our system?`));
+${info(prompt)}`);
   }
 }
 var init_flow2 = __esm(() => {
@@ -5025,7 +5088,7 @@ init_config();
 init_providers();
 
 // src/version/version.ts
-var VERSION = "0.2.0";
+var VERSION = "0.3.1";
 var COMMIT = "none";
 var DATE = "unknown";
 function getVersionString() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",