@construct-space/cli 1.2.0 → 1.3.1

package/dist/index.js

@@ -4507,22 +4507,6 @@ var dist_default6 = createPrompt((config, done) => {
 });
 // src/lib/utils.ts
 import { execSync } from "child_process";
-import { platform } from "os";
-function openBrowser(url) {
-  try {
-    switch (platform()) {
-      case "darwin":
-        execSync(`open "${url}"`);
-        break;
-      case "linux":
-        execSync(`xdg-open "${url}"`);
-        break;
-      case "win32":
-        execSync(`rundll32 url.dll,FileProtocolHandler "${url}"`);
-        break;
-    }
-  } catch {}
-}
 function git(dir, ...args) {
   const quoted = args.map((a) => a.includes(" ") || a.includes(":") ? `"${a}"` : a);
   return execSync(`git ${quoted.join(" ")}`, { cwd: dir, encoding: "utf-8" }).trim();
@@ -9390,12 +9374,12 @@ import { join as join11 } from "path";
 // src/lib/appdir.ts
 import { join as join10 } from "path";
 import { homedir } from "os";
-import { platform as platform2 } from "process";
+import { platform } from "process";
 function dataDir() {
   if (process.env.CONSTRUCT_DATA_DIR)
     return process.env.CONSTRUCT_DATA_DIR;
   const home = homedir();
-  switch (platform2) {
+  switch (platform) {
     case "darwin":
       return join10(home, "Library", "Application Support", "Construct");
     case "win32": {
@@ -9411,6 +9395,9 @@ function dataDir() {
 function spacesDir() {
   return join10(dataDir(), "spaces");
 }
+function profilesDir() {
+  return join10(dataDir(), "profiles");
+}
 function spaceDir(spaceId) {
   return join10(spacesDir(), spaceId);
 }
@@ -9440,14 +9427,43 @@ function install() {
 }
 
 // src/commands/publish.ts
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, statSync as statSync5, unlinkSync as unlinkSync2 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, statSync as statSync6, unlinkSync as unlinkSync2 } from "fs";
 import { join as join14, basename as basename6 } from "path";
 
 // src/lib/auth.ts
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, unlinkSync, existsSync as existsSync9 } from "fs";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, unlinkSync, existsSync as existsSync9, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
 import { join as join12, dirname as dirname4 } from "path";
 var CREDENTIALS_FILE = "credentials.json";
-var DEFAULT_PORTAL = "https://developer.construct.space";
+var DEFAULT_PORTAL = "https://my.construct.space/api/developer";
+function listDesktopProfiles() {
+  const dir = profilesDir();
+  if (!existsSync9(dir))
+    return [];
+  const results = [];
+  for (const entry of readdirSync4(dir)) {
+    const full = join12(dir, entry);
+    try {
+      if (!statSync4(full).isDirectory())
+        continue;
+      const authPath = join12(full, "auth.json");
+      if (!existsSync9(authPath))
+        continue;
+      const data = JSON.parse(readFileSync6(authPath, "utf-8"));
+      if (!data.token)
+        continue;
+      if (data.authenticated !== undefined && !data.authenticated)
+        continue;
+      results.push({
+        id: entry,
+        token: data.token,
+        user: data.user,
+        updatedAt: data.updated_at,
+        authenticated: true
+      });
+    } catch {}
+  }
+  return results;
+}
 function credentialsPath() {
   return join12(dataDir(), CREDENTIALS_FILE);
 }
@@ -9483,7 +9499,7 @@ function clear() {
 }
 
 // src/lib/pack.ts
-import { readdirSync as readdirSync4, statSync as statSync4, existsSync as existsSync10 } from "fs";
+import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync10 } from "fs";
 import { join as join13 } from "path";
 import { tmpdir } from "os";
 import { execSync as execSync3 } from "child_process";
@@ -9525,8 +9541,8 @@ async function packSource(root) {
     if (existsSync10(join13(root, name)))
       entries.push(name);
   }
-  for (const entry of readdirSync4(root)) {
-    if (statSync4(join13(root, entry)).isDirectory())
+  for (const entry of readdirSync5(root)) {
+    if (statSync5(join13(root, entry)).isDirectory())
       continue;
     if (allowedRootFiles.includes(entry))
       continue;
@@ -9546,7 +9562,7 @@ async function packSource(root) {
   const excludes = "--exclude=node_modules --exclude=dist --exclude=.git --exclude=*.env --exclude=*.log --exclude=*.lock --exclude=*.lockb";
   const cmd = `tar czf "${tarballPath}" ${excludes} ${validEntries.join(" ")}`;
   execSync3(cmd, { cwd: root });
-  const size = statSync4(tarballPath).size;
+  const size = statSync5(tarballPath).size;
   if (size > MAX_SIZE) {
     throw new Error(`Source exceeds maximum size of ${MAX_SIZE / 1024 / 1024}MB`);
   }
@@ -9560,7 +9576,7 @@ async function uploadSource(portalURL, token, tarballPath, m) {
   const fileData = readFileSync7(tarballPath);
   const blob = new Blob([fileData]);
   formData.append("source", blob, basename6(tarballPath));
-  const resp = await fetch(`${portalURL}/api/publish`, {
+  const resp = await fetch(`${portalURL}/publish`, {
     method: "POST",
     headers: { Authorization: `Bearer ${token}` },
     body: formData
@@ -9696,7 +9712,7 @@ async function publish(options) {
   let tarballPath;
   try {
     tarballPath = await packSource(root);
-    const size = statSync5(tarballPath).size;
+    const size = statSync6(tarballPath).size;
     spinner.succeed(`Source packed (${formatBytes(size)})`);
   } catch (err) {
     spinner.fail("Pack failed");
@@ -9875,9 +9891,8 @@ function clean(options) {
 }
 
 // src/commands/login.ts
-import { createServer } from "http";
+var ACCOUNTS_SCOPE_URL = "https://my.construct.space/api/accounts/me/scope";
 async function login(options) {
-  const portalURL = options?.portal || DEFAULT_PORTAL;
   if (isAuthenticated()) {
     const creds = load2();
     const name = creds.user?.name || "unknown";
@@ -9885,72 +9900,81 @@ async function login(options) {
     console.log(source_default.dim("  Run 'construct logout' to sign out first."));
     return;
   }
-  const server = createServer();
-  await new Promise((resolve3) => server.listen(0, "127.0.0.1", resolve3));
-  const port = server.address().port;
-  server.close();
-  const callbackURL = `http://localhost:${port}/callback`;
-  const loginURL = `${portalURL}/api/auth/cli-login?callback=${encodeURIComponent(callbackURL)}`;
-  const tokenPromise = new Promise((resolve3, reject) => {
-    const timeout = setTimeout(() => {
-      srv.close();
-      reject(new Error("Login timed out. Try again."));
-    }, 5 * 60 * 1000);
-    const srv = createServer((req, res) => {
-      const url = new URL(req.url, `http://localhost:${port}`);
-      if (url.pathname !== "/callback") {
-        res.end();
-        return;
-      }
-      const error2 = url.searchParams.get("error");
-      const token = url.searchParams.get("token");
-      res.setHeader("Content-Type", "text/html");
-      if (error2) {
-        res.end(`<html><body style="font-family:system-ui;text-align:center;padding:60px">
-          <h2 style="color:#EF4444">Login Failed</h2><p>${error2}</p>
-          <p style="color:#6B7280">You can close this window.</p></body></html>`);
-        clearTimeout(timeout);
-        srv.close();
-        reject(new Error(error2));
-        return;
-      }
-      if (!token) {
-        res.end(`<html><body style="font-family:system-ui;text-align:center;padding:60px">
-          <h2 style="color:#EF4444">Login Failed</h2><p>No token received.</p>
-          <p style="color:#6B7280">You can close this window.</p></body></html>`);
-        clearTimeout(timeout);
-        srv.close();
-        reject(new Error("No token received"));
-        return;
-      }
-      res.end(`<html><body style="font-family:system-ui;text-align:center;padding:60px">
-        <h2 style="color:#10B981">Logged In!</h2>
-        <p>You can close this window and return to your terminal.</p></body></html>`);
-      clearTimeout(timeout);
-      srv.close();
-      resolve3(token);
-    });
-    srv.listen(port, "127.0.0.1");
-  });
-  console.log(source_default.blue("Opening browser to log in..."));
-  console.log(source_default.dim("  If the browser doesn't open, visit:"));
-  console.log(source_default.dim(`  ${loginURL}`));
+  if (options?.token) {
+    await loginWithToken(options.token);
+    return;
+  }
+  const profiles = listDesktopProfiles();
+  if (profiles.length > 0) {
+    await loginFromProfile(profiles);
+    return;
+  }
+  console.log(source_default.yellow("No signed-in profiles found on this machine."));
+  console.log();
+  console.log("  Two options:");
+  console.log("    1. Sign in with the Construct desktop app and re-run this command, or");
+  console.log(`    2. Paste a token from ${source_default.cyan("https://my.construct.space/settings/tokens")} below.`);
   console.log();
-  openBrowser(loginURL);
-  console.log(source_default.dim("  Waiting for authentication..."));
+  const token = await dist_default5({
+    message: "Token (or press Ctrl+C to cancel):",
+    validate: (s) => s.trim().length > 0 || "Token required"
+  });
+  await loginWithToken(token.trim());
+}
+async function loginFromProfile(profiles) {
+  let picked = profiles[0];
+  if (profiles.length > 1) {
+    picked = await dist_default6({
+      message: "Choose a profile to use:",
+      choices: profiles.map((p) => ({ name: formatLabel(p), value: p }))
+    });
+  }
+  const user = {
+    id: picked.user?.id || picked.id,
+    name: picked.user?.name || picked.user?.username || picked.id,
+    email: picked.user?.email || ""
+  };
+  store({ token: picked.token, portal: DEFAULT_PORTAL, user });
+  console.log(source_default.green(`Logged in as ${user.name}`));
+  if (user.email)
+    console.log(source_default.dim(`  ${user.email}`));
+  console.log(source_default.dim(`  profile: ${picked.id}`));
+}
+async function loginWithToken(token) {
+  let resp;
   try {
-    const token = await tokenPromise;
-    const resp = await fetch(`${portalURL}/api/auth/cli-verify`, {
+    resp = await fetch(ACCOUNTS_SCOPE_URL, {
       headers: { Authorization: `Bearer ${token}` }
     });
-    const { user } = await resp.json();
-    store({ token, portal: portalURL, user });
-    console.log();
-    console.log(source_default.green(`Logged in as ${user?.name || "there"}`));
   } catch (err) {
-    console.error(source_default.red(`Login failed: ${err.message}`));
+    console.error(source_default.red(`Failed to reach accounts service: ${err.message}`));
+    process.exit(1);
+  }
+  if (resp.status === 401) {
+    console.error(source_default.red("Token rejected by accounts service (invalid or expired)."));
     process.exit(1);
   }
+  if (!resp.ok) {
+    console.error(source_default.red(`Token verification failed (HTTP ${resp.status}).`));
+    process.exit(1);
+  }
+  const body = await resp.json();
+  const u = body.user || {};
+  const user = {
+    id: u.id || u.uuid || "",
+    name: u.name || u.username || "",
+    email: u.email || ""
+  };
+  store({ token, portal: DEFAULT_PORTAL, user });
+  console.log(source_default.green(`Logged in as ${user.name || "unknown"}`));
+  if (user.email)
+    console.log(source_default.dim(`  ${user.email}`));
+}
+function formatLabel(p) {
+  const name = p.user?.name || p.user?.username || p.id;
+  const email = p.user?.email;
+  const kind = p.id.startsWith("org:") ? " [org]" : "";
+  return email ? `${name}${kind}  ${source_default.dim(email)}` : `${name}${kind}  ${source_default.dim(p.id)}`;
 }
 function logout() {
   clear();
@@ -10229,7 +10253,7 @@ function updateBarrel(modelsDir, modelName) {
 }
 
 // src/commands/graph/push.ts
-import { existsSync as existsSync16, readdirSync as readdirSync5, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync6, readFileSync as readFileSync12 } from "fs";
 import { join as join20, basename as basename7 } from "path";
 async function graphPush() {
   const root = process.cwd();
@@ -10243,7 +10267,7 @@ async function graphPush() {
     console.error(source_default.red("No src/models/ directory found. Run 'construct graph init' first."));
     process.exit(1);
   }
-  const modelFiles = readdirSync5(modelsDir).filter((f) => f.endsWith(".ts") && f !== "index.ts");
+  const modelFiles = readdirSync6(modelsDir).filter((f) => f.endsWith(".ts") && f !== "index.ts");
   if (modelFiles.length === 0) {
     console.error(source_default.red("No model files found in src/models/"));
     console.log(source_default.dim("  Generate one: construct graph g User name:string email:string"));
@@ -10384,7 +10408,7 @@ function parseModelFile(content, fileName) {
 }
 
 // src/commands/graph/migrate.ts
-import { existsSync as existsSync17, readdirSync as readdirSync6, readFileSync as readFileSync13 } from "fs";
+import { existsSync as existsSync17, readdirSync as readdirSync7, readFileSync as readFileSync13 } from "fs";
 import { join as join21, basename as basename8 } from "path";
 async function graphMigrate(options) {
   const root = process.cwd();
@@ -10421,7 +10445,7 @@ async function graphMigrate(options) {
     spinner.fail("Could not fetch schema");
     process.exit(1);
   }
-  const modelFiles = readdirSync6(modelsDir).filter((f) => f.endsWith(".ts") && f !== "index.ts");
+  const modelFiles = readdirSync7(modelsDir).filter((f) => f.endsWith(".ts") && f !== "index.ts");
   const localModels = [];
   for (const file of modelFiles) {
     const content = readFileSync13(join21(modelsDir, file), "utf-8");
@@ -10528,7 +10552,7 @@ function parseModelFields(content, fileName) {
 }
 
 // src/index.ts
-var VERSION = "1.2.0";
+var VERSION = "1.3.1";
 var program2 = new Command;
 program2.name("construct").description("Construct CLI \u2014 scaffold, build, develop, and publish spaces").version(VERSION);
 program2.command("scaffold [name]").alias("new").alias("create").description("Create a new Construct space project").option("--with-tests", "Include E2E testing boilerplate").option("--full", "Full preset: multiple pages, extra skills, widget templates").action(async (name, opts) => scaffold(name, opts));
@@ -10539,7 +10563,7 @@ program2.command("publish").description("Publish a space to the Construct regist
 program2.command("validate").description("Validate space.manifest.json").action(() => validate3());
 program2.command("check").description("Run type-check (vue-tsc) and linter (eslint)").action(() => check());
 program2.command("clean").description("Remove build artifacts").option("--all", "Also remove node_modules and lockfiles").action((opts) => clean(opts));
-program2.command("login").description("Authenticate with Construct").option("--portal <url>", "Portal URL").action(async (opts) => login(opts));
+program2.command("login").description("Authenticate with Construct").option("--portal <url>", "Portal URL").option("--token <token>", "Authenticate with a token directly (skip desktop profile picker)").action(async (opts) => login(opts));
 program2.command("logout").description("Sign out").action(() => logout());
 program2.command("update").description("Update the CLI to the latest version").action(() => update());
 var graph = program2.command("graph").description("Construct Graph \u2014 data models and GraphQL");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@construct-space/cli",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Construct CLI — scaffold, build, develop, and publish spaces",
   "type": "module",
   "bin": {