@bloque/cli 0.0.46 → 0.0.47

package/dist/bin.js

@@ -43,6 +43,9 @@ var SessionStore = class _SessionStore {
 };
 
 // src/ui/portal.ts
+import { stdout as stdout2 } from "process";
+
+// src/ui/shared.ts
 import { stdout } from "process";
 var ESC = "\x1B";
 var RESET = `${ESC}[0m`;
@@ -101,6 +104,14 @@ function generateStarField() {
   }
   return field;
 }
+function writeLines(lines) {
+  stdout.write(lines.join("\n") + "\n");
+}
+function clearLines(count) {
+  stdout.write(`${ESC}[${count}A${ESC}[0J`);
+}
+
+// src/ui/portal.ts
 function renderFrame(radius, stars, shimmer = false) {
   const lines = [];
   for (let y = 0; y < HEIGHT; y++) {
@@ -116,10 +127,10 @@ function renderFrame(radius, stars, shimmer = false) {
         if (Math.abs(dist - r) < hitThreshold) {
           const t = 1 - r / MAX_RADIUS;
           const idx = Math.round(t * (PALETTE.length - 1));
-          color = PALETTE[idx];
+          color = PALETTE[idx] ?? "";
           if (r === 0) {
             char = "\u2726";
-            color = BOLD + PALETTE[PALETTE.length - 1];
+            color = BOLD + (PALETTE[PALETTE.length - 1] ?? "");
           } else if (r <= 2) {
             char = shimmer && Math.random() < 0.3 ? "\u2727" : "\u25E6";
           } else {
@@ -128,7 +139,7 @@ function renderFrame(radius, stars, shimmer = false) {
           break;
         }
       }
-      if (char === " " && stars[y][x]) {
+      if (char === " " && stars[y]?.[x]) {
         const twinkle = shimmer && Math.random() < 0.3;
         color = twinkle ? MED_STAR : DIM_STAR;
         char = ".";
@@ -147,20 +158,14 @@ function renderSuccess(message) {
     ""
   ];
 }
-function writeLines(lines) {
-  stdout.write(lines.join("\n") + "\n");
-}
-function clearLines(count) {
-  stdout.write(`${ESC}[${count}A${ESC}[0J`);
-}
 async function portalAnimation(message) {
-  if (!stdout.isTTY) {
+  if (!stdout2.isTTY) {
     console.log(`
   \u25C6 ${message}
 `);
     return;
   }
-  stdout.write(HIDE_CURSOR);
+  stdout2.write(HIDE_CURSOR);
   const stars = generateStarField();
   try {
     const frame0 = renderFrame(0, stars);
@@ -192,7 +197,7 @@ async function portalAnimation(message) {
     const successLines = renderSuccess(message);
     writeLines(successLines);
   } finally {
-    stdout.write(SHOW_CURSOR);
+    stdout2.write(SHOW_CURSOR);
   }
 }
 
@@ -2090,6 +2095,246 @@ import { execSync } from "child_process";
 import { Command as Command5 } from "commander";
 import { SDK as SDK3 } from "@bloque/sdk";
 import { checkbox, confirm, input as input2, password as password2, select as select2 } from "@inquirer/prompts";
+
+// src/auth/web.ts
+import { exec } from "child_process";
+import crypto from "crypto";
+import http from "http";
+
+// src/ui/beacon.ts
+import { stdout as stdout3 } from "process";
+var FRAME_MS = 80;
+var RING_CYCLE = MAX_RADIUS + 3;
+var RING_OFFSET = Math.floor(RING_CYCLE / 2);
+function renderBeaconFrame(frame, stars) {
+  const ring1Radius = frame % RING_CYCLE;
+  const ring2Radius = (frame + RING_OFFSET) % RING_CYCLE;
+  const lines = [];
+  for (let y = 0; y < HEIGHT; y++) {
+    let line = "";
+    for (let x = 0; x < WIDTH; x++) {
+      const dx = (x - CX) / ASPECT;
+      const dy = y - CY;
+      const dist = Math.sqrt(dx * dx + dy * dy);
+      let char = " ";
+      let color = "";
+      if (dist < 0.5) {
+        char = "\u2726";
+        color = BOLD + PALETTE[PALETTE.length - 1];
+      } else {
+        for (const ringR of [ring1Radius, ring2Radius]) {
+          if (ringR > MAX_RADIUS) continue;
+          const hitThreshold = ringR <= 2 ? 0.6 : 0.55;
+          if (Math.abs(dist - ringR) < hitThreshold) {
+            const fade = ringR / MAX_RADIUS;
+            const idx = Math.round(fade * (PALETTE.length - 1));
+            const reverseIdx = PALETTE.length - 1 - idx;
+            color = PALETTE[reverseIdx];
+            if (ringR <= 2) {
+              char = Math.random() < 0.25 ? "\u2727" : "\u25E6";
+            } else {
+              char = Math.random() < 0.12 ? "\u2727" : "\xB7";
+            }
+            break;
+          }
+        }
+      }
+      if (char === " " && stars[y][x]) {
+        const twinkle = Math.random() < 0.15;
+        color = twinkle ? MED_STAR : DIM_STAR;
+        char = ".";
+      }
+      line += char !== " " ? color + char + RESET : " ";
+    }
+    lines.push(line);
+  }
+  return lines;
+}
+function startBeaconAnimation() {
+  if (!stdout3.isTTY) {
+    return () => {
+    };
+  }
+  const stars = generateStarField();
+  let frame = 0;
+  let running = true;
+  stdout3.write(HIDE_CURSOR);
+  const initial = renderBeaconFrame(frame, stars);
+  writeLines(initial);
+  frame++;
+  const interval = setInterval(() => {
+    if (!running) return;
+    clearLines(HEIGHT);
+    const lines = renderBeaconFrame(frame, stars);
+    writeLines(lines);
+    frame++;
+  }, FRAME_MS);
+  return () => {
+    if (!running) return;
+    running = false;
+    clearInterval(interval);
+    clearLines(HEIGHT);
+    stdout3.write(SHOW_CURSOR);
+  };
+}
+
+// src/auth/web.ts
+var TIMEOUT_MS = 5 * 60 * 1e3;
+var MAX_PORT_RETRIES = 3;
+function resolveCopilotUrl(mode, host) {
+  if (host) return host;
+  if (process.env.BLOQUE_COPILOT_URL) return process.env.BLOQUE_COPILOT_URL;
+  return mode === "sandbox" ? "https://copilot-dev.bloque.app" : "https://copilot.bloque.app";
+}
+function openBrowser(url) {
+  const cmd = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
+  exec(cmd, () => {
+  });
+}
+function setCorsHeaders(res, copilotUrl) {
+  res.setHeader("Access-Control-Allow-Origin", copilotUrl);
+  res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
+  res.setHeader("Access-Control-Allow-Headers", "Content-Type");
+}
+function listenOnRandomPort(server) {
+  return new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      server.removeListener("error", reject);
+      const addr = server.address();
+      if (!addr || typeof addr === "string") {
+        reject(new Error("Failed to bind server"));
+        return;
+      }
+      resolve(addr.port);
+    });
+  });
+}
+function startCallbackServer(nonce, copilotUrl) {
+  let resolveToken;
+  const tokenPromise = new Promise((resolve) => {
+    resolveToken = resolve;
+  });
+  const server = http.createServer((req, res) => {
+    setCorsHeaders(res, copilotUrl);
+    if (req.method === "OPTIONS") {
+      res.writeHead(204);
+      res.end();
+      return;
+    }
+    if (req.method === "POST" && req.url === "/callback") {
+      let body = "";
+      req.on("data", (chunk) => {
+        body += chunk;
+      });
+      req.on("end", () => {
+        try {
+          const data = JSON.parse(body);
+          if (data.nonce !== nonce) {
+            res.writeHead(403, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                error: "invalid_nonce",
+                message: "Nonce does not match"
+              })
+            );
+            return;
+          }
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ success: true }));
+          resolveToken({ token: data.token, apiUrl: data.api_url });
+        } catch {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "invalid_body" }));
+        }
+      });
+      return;
+    }
+    res.writeHead(404);
+    res.end();
+  });
+  return { server, tokenPromise };
+}
+async function startWebAuth(mode, host) {
+  const copilotUrl = resolveCopilotUrl(mode, host);
+  const nonce = crypto.randomBytes(32).toString("hex");
+  const { server, tokenPromise } = startCallbackServer(nonce, copilotUrl);
+  let port;
+  for (let attempt = 0; attempt < MAX_PORT_RETRIES; attempt++) {
+    try {
+      port = await listenOnRandomPort(server);
+      break;
+    } catch (err) {
+      const isAddrInUse = err instanceof Error && "code" in err && err.code === "EADDRINUSE";
+      if (!isAddrInUse || attempt === MAX_PORT_RETRIES - 1) {
+        throw err;
+      }
+    }
+  }
+  if (port === void 0) {
+    throw new Error("Failed to start local callback server");
+  }
+  const authUrl = `${copilotUrl}/cli/auth?port=${port}&nonce=${nonce}`;
+  console.log("\n\u{1F511} Opening browser for authorization...\n");
+  console.log("   Waiting for you to authorize in the browser.");
+  console.log("   If the browser didn't open, visit:\n");
+  console.log(`   ${authUrl}
+`);
+  openBrowser(authUrl);
+  const stopBeacon = startBeaconAnimation();
+  const cleanup = () => {
+    stopBeacon();
+    server.close();
+  };
+  const sigintHandler = () => {
+    cleanup();
+    process.exit(130);
+  };
+  process.on("SIGINT", sigintHandler);
+  try {
+    const result = await Promise.race([
+      tokenPromise,
+      new Promise(
+        (_, reject) => setTimeout(() => reject(new Error("timeout")), TIMEOUT_MS)
+      )
+    ]);
+    cleanup();
+    process.removeListener("SIGINT", sigintHandler);
+    const store6 = new SessionStore();
+    const session = {
+      accessToken: result.token,
+      urn: "",
+      origin: copilotUrl,
+      mode,
+      authType: "jwt",
+      apiUrl: result.apiUrl,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    try {
+      store6.save(session);
+    } catch {
+      console.warn(
+        "\n  \u26A0 Could not write credentials to ~/.bloque/session.json"
+      );
+      console.warn("    Printing token so you can save it manually:\n");
+      console.log(result.token);
+    }
+    await portalAnimation(`Authenticated via ${copilotUrl}`);
+    console.log(`  Token stored in ~/.bloque/session.json`);
+    console.log("  You can now use @bloque/cli commands.\n");
+    return session;
+  } catch (err) {
+    cleanup();
+    process.removeListener("SIGINT", sigintHandler);
+    if (err instanceof Error && err.message === "timeout") {
+      console.error("\n\u2717 Authorization timed out. Please try again.\n");
+      process.exit(1);
+    }
+    throw err;
+  }
+}
+
+// src/commands/setup.ts
 var store5 = new SessionStore();
 var OTP_CHANNELS2 = [
   {
@@ -2267,11 +2512,14 @@ async function runOtpLogin(mode) {
   });
   await portalAnimation(`Connected as ${clients.urn ?? userAlias}`);
 }
-var setupCommand = new Command5("setup").description("Set up Bloque MCP in your AI code agents").option("--jwt <token>", "JWT token for authentication (skips OTP)").option("--sandbox", "Use sandbox environment instead of production").action(async (opts) => {
-  const { jwt, sandbox } = opts;
+var setupCommand = new Command5("setup").description("Set up Bloque MCP in your AI code agents").option("--web", "Authenticate via browser").option("--host <url>", "Copilot app URL (only with --web)").option("--jwt <token>", "JWT token for authentication (skips OTP)").option("--sandbox", "Use sandbox environment instead of production").action(async (opts) => {
+  const { web, host, jwt, sandbox } = opts;
   const mode = sandbox ? "sandbox" : "production";
   console.log("\n  Bloque Setup Wizard\n");
-  if (jwt) {
+  if (web) {
+    const session = await startWebAuth(mode, host);
+    store5.save(session);
+  } else if (jwt) {
     store5.save({
       accessToken: jwt,
       urn: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloque/cli",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "Bloque CLI — authenticate and expose SDK capabilities as an MCP server",
   "type": "module",
   "bin": {