magic-spells 0.1.0 → 0.2.0

package/dist/{operations-P3DUAVPP.js → operations-GGMLIYEW.js}

@@ -1,8 +1,8 @@
 import {
   operations,
   operationsByName
-} from "./chunk-S5IUP7G2.js";
-import "./chunk-YT2Z756Z.js";
+} from "./chunk-PQFOO5A7.js";
+import "./chunk-JZ7XESF4.js";
 export {
   operations,
   operationsByName

package/dist/src-DJYPPJFM.js

@@ -0,0 +1,16 @@
+// ../sites/src/index.ts
+var sites = {
+  id: "sites",
+  title: "Sites",
+  credential: "sites_",
+  apiUrl: "https://api.sites.magicspells.io",
+  keyHelp: "Sites \u2192 Settings \u2192 Access keys",
+  sessions: { path: "/v1/cli/sessions" },
+  load: async () => [],
+  client: () => null
+};
+var src_default = sites;
+export {
+  src_default as default,
+  sites
+};

package/dist/src-KJGFPRQP.js

@@ -0,0 +1,17 @@
+// ../marketing/src/index.ts
+var marketing = {
+  id: "marketing",
+  title: "Marketing",
+  credential: "marketing_",
+  apiUrl: "https://marketing.magicspells.io",
+  keyHelp: "Marketing \u2192 Settings \u2192 API keys",
+  // Marketing serves its API under /api/v1 on the app host.
+  sessions: { path: "/api/v1/cli/sessions" },
+  load: async () => [],
+  client: () => null
+};
+var src_default = marketing;
+export {
+  src_default as default,
+  marketing
+};

package/dist/{src-4S3XHPWY.js → src-L2I546M7.js}

@@ -3,16 +3,13 @@ import {
   operationsByName,
   pyramidError,
   toPyramidError
-} from "./chunk-S5IUP7G2.js";
+} from "./chunk-PQFOO5A7.js";
 import {
   MagicError,
   TtlCache,
-  createCredentialStore,
-  maskKey,
   readField,
-  readStr,
-  saveProductKey
-} from "./chunk-YT2Z756Z.js";
+  readStr
+} from "./chunk-JZ7XESF4.js";
 
 // ../pyramid/src/cache/resolver.ts
 var TTL_MS = 6e4;
@@ -890,7 +887,7 @@ var PYRAMID_CREDENTIAL = {
 var DEFAULT_API_URL = "https://api.pyramid.magicspells.io";
 
 // ../pyramid/src/doctor.ts
-var whoamiOp = async () => (await import("./operations-P3DUAVPP.js")).operationsByName.get("pyramid.whoami");
+var whoamiOp = async () => (await import("./operations-GGMLIYEW.js")).operationsByName.get("pyramid.whoami");
 var doctorChecks = [
   {
     name: "pyramid auth",
@@ -923,226 +920,6 @@ var doctorChecks = [
   }
 ];
 
-// ../pyramid/src/login.ts
-import { spawn } from "node:child_process";
-import { randomBytes } from "node:crypto";
-import { createServer } from "node:http";
-var DEFAULT_WEB_URL = "https://pyramid.magicspells.io";
-var DEFAULT_LOGIN_TIMEOUT_MS = 2 * 60 * 1e3;
-var MAX_CALLBACK_BODY_BYTES = 4 * 1024;
-var realIO = {
-  out: (line) => process.stderr.write(`${line}
-`),
-  setKey: async (key) => {
-    await saveProductKey(PYRAMID_CREDENTIAL, createCredentialStore(), key);
-  },
-  openBrowser,
-  env: process.env,
-  randomState: () => randomBytes(24).toString("base64url"),
-  loginTimeoutMs: DEFAULT_LOGIN_TIMEOUT_MS
-};
-var LOGIN_USAGE = "usage: magic pyramid login [--web-url <url>] [--name <key name>]";
-function parseLoginOptions(argv, env) {
-  let webUrl = env.MAGIC_PYRAMID_WEB_URL?.trim() || DEFAULT_WEB_URL;
-  let name = "Magic CLI";
-  const args = argv;
-  for (let i = 0; i < args.length; i += 1) {
-    const arg = args[i];
-    if (arg === "--help" || arg === "-h") return "help";
-    if (arg === "--web-url") {
-      const next = args[++i];
-      if (!next) return LOGIN_USAGE;
-      webUrl = next;
-      continue;
-    }
-    if (arg.startsWith("--web-url=")) {
-      webUrl = arg.slice("--web-url=".length);
-      continue;
-    }
-    if (arg === "--name") {
-      const next = args[++i];
-      if (!next) return LOGIN_USAGE;
-      name = next;
-      continue;
-    }
-    if (arg.startsWith("--name=")) {
-      name = arg.slice("--name=".length);
-      continue;
-    }
-    return `unknown option for magic pyramid login: ${arg}`;
-  }
-  try {
-    new URL(webUrl);
-  } catch {
-    return `MAGIC_PYRAMID_WEB_URL is not a valid URL: "${webUrl}".`;
-  }
-  return { webUrl, name: name.trim() || "Magic CLI" };
-}
-function authURL(webUrl, callbackURL, state, name) {
-  const target = new URL("/auth/cli", webUrl);
-  target.searchParams.set("redirect_uri", callbackURL);
-  target.searchParams.set("state", state);
-  target.searchParams.set("name", name);
-  return target.toString();
-}
-function readCallbackForm(req) {
-  return new Promise((resolve, reject) => {
-    const chunks = [];
-    let size = 0;
-    const onData = (chunk) => {
-      size += chunk.length;
-      if (size > MAX_CALLBACK_BODY_BYTES) {
-        req.off("data", onData);
-        req.resume();
-        resolve(null);
-        return;
-      }
-      chunks.push(chunk);
-    };
-    req.on("data", onData);
-    req.once("end", () => resolve(new URLSearchParams(Buffer.concat(chunks).toString("utf8"))));
-    req.once("error", reject);
-  });
-}
-function closeServer(server) {
-  return new Promise((resolve) => {
-    server.close(() => resolve());
-  });
-}
-async function runLogin(argv, io = realIO) {
-  const opts = parseLoginOptions(argv, io.env);
-  if (opts === "help") {
-    io.out(LOGIN_USAGE);
-    io.out("Opens Pyramid in the browser and stores the workspace key it mints.");
-    return 0;
-  }
-  if (typeof opts === "string") {
-    io.out(opts);
-    return 2;
-  }
-  const state = io.randomState();
-  let settled = false;
-  let timeout;
-  let finish;
-  const done = new Promise((resolve) => {
-    finish = (code) => {
-      if (settled) return;
-      settled = true;
-      if (timeout) clearTimeout(timeout);
-      resolve(code);
-    };
-  });
-  const server = createServer(async (req, res) => {
-    const requestURL = new URL(req.url ?? "/", "http://127.0.0.1");
-    if (requestURL.pathname !== "/callback") {
-      res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
-      res.end("Not found.\n");
-      return;
-    }
-    if (req.method !== "POST" || requestURL.searchParams.has("key")) {
-      res.writeHead(405, { "content-type": "text/plain; charset=utf-8", allow: "POST" });
-      res.end("Method not allowed. Return to your terminal.\n");
-      io.out("Ignored a Pyramid login callback that did not POST the key.");
-      return;
-    }
-    let form;
-    try {
-      form = await readCallbackForm(req);
-    } catch {
-      return;
-    }
-    if (!form) {
-      res.writeHead(413, { "content-type": "text/plain; charset=utf-8", connection: "close" });
-      res.end("Login callback too large. Return to your terminal.\n");
-      io.out("Ignored an oversized Pyramid login callback.");
-      return;
-    }
-    const gotState = form.get("state") ?? "";
-    if (gotState !== state) {
-      res.writeHead(400, { "content-type": "text/plain; charset=utf-8" });
-      res.end("Invalid login state. Return to your terminal.\n");
-      io.out("Rejected Pyramid login callback with an invalid state.");
-      void closeServer(server).then(() => finish(1));
-      return;
-    }
-    const error = form.get("error");
-    if (error) {
-      res.writeHead(200, { "content-type": "text/plain; charset=utf-8" });
-      res.end("Pyramid login cancelled. Return to your terminal.\n");
-      io.out(
-        error === "access_denied" ? "Pyramid login cancelled." : `Pyramid login failed: ${error}`
-      );
-      void closeServer(server).then(() => finish(1));
-      return;
-    }
-    const key = form.get("key")?.trim() ?? "";
-    if (!key.startsWith(PYRAMID_CREDENTIAL.credential)) {
-      res.writeHead(400, { "content-type": "text/plain; charset=utf-8" });
-      res.end("Invalid Pyramid key. Return to your terminal.\n");
-      io.out("Pyramid login returned an invalid key.");
-      void closeServer(server).then(() => finish(1));
-      return;
-    }
-    try {
-      await io.setKey(key);
-    } catch (err) {
-      res.writeHead(500, { "content-type": "text/plain; charset=utf-8" });
-      res.end("Could not store the key. Return to your terminal.\n");
-      io.out(
-        `Could not store the Pyramid key: ${err instanceof Error ? err.message : String(err)}`
-      );
-      void closeServer(server).then(() => finish(1));
-      return;
-    }
-    res.writeHead(200, { "content-type": "text/plain; charset=utf-8" });
-    res.end("Pyramid CLI connected. You can close this tab.\n");
-    io.out(
-      `Saved ${maskKey(key, PYRAMID_CREDENTIAL.credential)} \u2014 magic and magic mcp will use it automatically.`
-    );
-    void closeServer(server).then(() => finish(0));
-  });
-  try {
-    await new Promise((resolve, reject) => {
-      server.once("error", reject);
-      server.listen(0, "127.0.0.1", () => {
-        server.off("error", reject);
-        resolve();
-      });
-    });
-  } catch (err) {
-    io.out(
-      `Could not start the local Pyramid login server: ${err instanceof Error ? err.message : String(err)}`
-    );
-    return 1;
-  }
-  const address = server.address();
-  const callbackURL = `http://127.0.0.1:${address.port}/callback`;
-  const loginURL = authURL(opts.webUrl, callbackURL, state, opts.name);
-  timeout = setTimeout(() => {
-    io.out("Pyramid login timed out before the browser completed the handoff.");
-    void closeServer(server).then(() => finish(1));
-  }, io.loginTimeoutMs);
-  const opened = await io.openBrowser(loginURL);
-  if (opened) {
-    io.out("Opened Pyramid in your browser. Authorize the CLI to finish login.");
-  } else {
-    io.out("Could not open your browser automatically. Open this URL to finish login:");
-    io.out(loginURL);
-  }
-  return done;
-}
-function openBrowser(url) {
-  return new Promise((resolve) => {
-    const platform = process.platform;
-    const command = platform === "darwin" ? "open" : platform === "win32" ? "cmd" : "xdg-open";
-    const args = platform === "win32" ? ["/c", "start", "", url] : [url];
-    const child = spawn(command, args, { detached: true, stdio: "ignore" });
-    child.once("error", () => resolve(false));
-    child.once("close", (code) => resolve(code === 0));
-    child.unref();
-  });
-}
-
 // ../pyramid/src/mcp/prompts.ts
 var DOCTOR_DESCRIPTION = "Check your Pyramid setup: confirm the API key authenticates and show the user, workspace, and accessible projects.";
 var DOCTOR_INSTRUCTION = [
@@ -1269,8 +1046,10 @@ function registerPyramidMcp(server, context) {
 var pyramid = {
   ...PYRAMID_CREDENTIAL,
   apiUrl: DEFAULT_API_URL,
+  // `magic login` mints workspace keys here from the Account grant (API-PYRAMID-CLI-SESSIONS).
+  sessions: { path: "/v1/cli/sessions" },
   // The operations graph loads only when a Pyramid command runs.
-  load: async () => (await import("./operations-P3DUAVPP.js")).operations,
+  load: async () => (await import("./operations-GGMLIYEW.js")).operations,
   client(session, config) {
     const api = new PyramidClient({
       apiKey: session.key,
@@ -1280,12 +1059,6 @@ var pyramid = {
   },
   // `--project` stays a Pyramid flag, usable anywhere in argv (pyramid-cli's global).
   globalFlags: ["project"],
-  commands: {
-    login: {
-      summary: "Sign in through Pyramid in the browser and store a workspace key (until R1)",
-      run: (argv) => runLogin(argv)
-    }
-  },
   doctor: doctorChecks,
   mcp: { instructions, register: registerPyramidMcp }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magic-spells",
-	"version": "0.1.0",
+	"version": "0.2.0",
 	"description": "Magic CLI — one command line and MCP server for Magic Spells' hosted services.",
 	"license": "MIT",
 	"type": "module",