@construct-space/cli 1.4.4 → 1.5.0

package/dist/index.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -2772,6 +2790,7 @@ var require_lib = __commonJS((exports, module) => {
 });
 
 // src/lib/appdir.ts
+import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
 import { join as join10 } from "path";
 import { homedir } from "os";
 import { platform } from "process";
@@ -2792,23 +2811,45 @@ function dataDir() {
     }
   }
 }
-function spacesDir() {
-  return join10(dataDir(), "spaces");
-}
 function profilesDir() {
   return join10(dataDir(), "profiles");
 }
+function activeProfileId() {
+  try {
+    const credsPath = join10(dataDir(), "credentials.json");
+    if (existsSync8(credsPath)) {
+      const c = JSON.parse(readFileSync6(credsPath, "utf-8"));
+      if (c.profileId)
+        return c.profileId;
+    }
+  } catch {}
+  try {
+    const regPath = join10(dataDir(), "profiles.json");
+    if (existsSync8(regPath)) {
+      const r = JSON.parse(readFileSync6(regPath, "utf-8"));
+      if (r.active_profile)
+        return r.active_profile;
+    }
+  } catch {}
+  return "";
+}
+function spacesDir() {
+  const profileId = activeProfileId();
+  if (profileId)
+    return join10(profilesDir(), profileId, "spaces");
+  return join10(dataDir(), "spaces");
+}
 function spaceDir(spaceId) {
   return join10(spacesDir(), spaceId);
 }
 var init_appdir = () => {};
 
 // src/lib/auth.ts
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, unlinkSync, existsSync as existsSync9, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, unlinkSync, existsSync as existsSync10, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
 import { join as join12, dirname as dirname4 } from "path";
 function listDesktopProfiles() {
   const dir = profilesDir();
-  if (!existsSync9(dir))
+  if (!existsSync10(dir))
     return [];
   const results = [];
   for (const entry of readdirSync4(dir)) {
@@ -2817,9 +2858,9 @@ function listDesktopProfiles() {
       if (!statSync4(full).isDirectory())
         continue;
       const authPath = join12(full, "auth.json");
-      if (!existsSync9(authPath))
+      if (!existsSync10(authPath))
         continue;
-      const data = JSON.parse(readFileSync6(authPath, "utf-8"));
+      const data = JSON.parse(readFileSync7(authPath, "utf-8"));
       if (!data.token)
         continue;
       if (data.authenticated !== undefined && !data.authenticated)
@@ -2846,10 +2887,10 @@ function store(creds) {
 }
 function load2() {
   const path = credentialsPath();
-  if (!existsSync9(path)) {
+  if (!existsSync10(path)) {
     throw new Error("not logged in \u2014 run 'construct login' first");
   }
-  const data = JSON.parse(readFileSync6(path, "utf-8"));
+  const data = JSON.parse(readFileSync7(path, "utf-8"));
   if (!data.token) {
     throw new Error("not logged in \u2014 run 'construct login' first");
   }
@@ -2865,7 +2906,7 @@ function isAuthenticated() {
 }
 function clear() {
   const path = credentialsPath();
-  if (existsSync9(path))
+  if (existsSync10(path))
     unlinkSync(path);
 }
 var CREDENTIALS_FILE = "credentials.json", DEFAULT_PORTAL = "https://my.construct.space/api/developer";
@@ -2937,7 +2978,15 @@ function graphBaseURL() {
 function resolveOrgId(explicit) {
   if (explicit)
     return explicit;
-  return process.env.CONSTRUCT_ORG_ID || "";
+  if (process.env.CONSTRUCT_ORG_ID)
+    return process.env.CONSTRUCT_ORG_ID;
+  try {
+    const creds = load2();
+    const pid = creds.profileId || "";
+    if (pid.startsWith("org:"))
+      return pid.slice("org:".length);
+  } catch {}
+  return "";
 }
 function loadCreds() {
   try {
@@ -3364,7 +3413,6 @@ var {
 init_source();
 import { mkdirSync, writeFileSync, existsSync as existsSync2, readFileSync } from "fs";
 import { join as join2, dirname } from "path";
-
 // node_modules/@inquirer/core/dist/lib/key.js
 var isUpKey = (key, keybindings = []) => key.name === "up" || keybindings.includes("vim") && key.name === "k" || keybindings.includes("emacs") && key.ctrl && key.name === "p";
 var isDownKey = (key, keybindings = []) => key.name === "down" || keybindings.includes("vim") && key.name === "j" || keybindings.includes("emacs") && key.ctrl && key.name === "n";
@@ -3509,7 +3557,7 @@ var effectScheduler = {
 // node_modules/@inquirer/core/dist/lib/use-state.js
 function useState(defaultValue) {
   return withPointer((pointer) => {
-    const setState = AsyncResource2.bind(function setState(newValue) {
+    const setState = AsyncResource2.bind(function setState2(newValue) {
       if (pointer.get() !== newValue) {
         pointer.set(newValue);
         handleChange();
@@ -7924,8 +7972,8 @@ function validate2(m) {
     errors2.push("author: must be an object with a name");
   if (!m.icon)
     errors2.push("icon: must be a string");
-  if (!["app", "project", "org", "any"].includes(m.scope))
-    errors2.push('scope: must be "app", "project", "org", or "any"');
+  if (!["app", "project", "org"].includes(m.scope))
+    errors2.push('scope: must be "app", "project", or "org"');
   if (!m.pages?.length)
     errors2.push("pages: must be a non-empty array");
   if (!m.navigation?.label)
@@ -9947,7 +9995,7 @@ async function dev() {
 
 // src/commands/run.ts
 init_source();
-import { existsSync as existsSync8, cpSync, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync9, cpSync, mkdirSync as mkdirSync3 } from "fs";
 import { join as join11 } from "path";
 init_appdir();
 function install() {
@@ -9957,13 +10005,13 @@ function install() {
     process.exit(1);
   }
   const distDir = join11(root, "dist");
-  if (!existsSync8(distDir)) {
+  if (!existsSync9(distDir)) {
     console.error(source_default.red("No dist/ directory found. Run 'construct build' first."));
     process.exit(1);
   }
   const m = read(root);
   const agentDir = join11(root, "agent");
-  if (existsSync8(agentDir)) {
+  if (existsSync9(agentDir)) {
     bundleAgentDir(agentDir, distDir);
   }
   const installDir = spaceDir(m.id);
@@ -9975,12 +10023,12 @@ function install() {
 
 // src/commands/publish.ts
 init_source();
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, statSync as statSync6, unlinkSync as unlinkSync2 } from "fs";
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync6, statSync as statSync6, unlinkSync as unlinkSync2 } from "fs";
 import { join as join14, basename as basename6 } from "path";
 init_auth();
 
 // src/lib/pack.ts
-import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync10 } from "fs";
+import { readdirSync as readdirSync5, statSync as statSync5, existsSync as existsSync11 } from "fs";
 import { join as join13 } from "path";
 import { tmpdir } from "os";
 import { execSync as execSync3 } from "child_process";
@@ -10019,7 +10067,7 @@ async function packSource(root) {
   const tarballPath = join13(tmpdir(), `space-source-${Date.now()}.tar.gz`);
   const entries = [];
   for (const name of allowedRootFiles) {
-    if (existsSync10(join13(root, name)))
+    if (existsSync11(join13(root, name)))
       entries.push(name);
   }
   for (const entry of readdirSync5(root)) {
@@ -10033,10 +10081,10 @@ async function packSource(root) {
       entries.push(entry);
   }
   for (const dir of allowedDirs) {
-    if (existsSync10(join13(root, dir)))
+    if (existsSync11(join13(root, dir)))
       entries.push(dir);
   }
-  const validEntries = entries.filter((e) => existsSync10(join13(root, e)));
+  const validEntries = entries.filter((e) => existsSync11(join13(root, e)));
   if (validEntries.length === 0) {
     throw new Error("No files to pack");
   }
@@ -10054,7 +10102,7 @@ async function packSource(root) {
 async function uploadSource(portalURL, token, tarballPath, m) {
   const formData = new FormData;
   formData.append("manifest", JSON.stringify(m));
-  const fileData = readFileSync7(tarballPath);
+  const fileData = readFileSync8(tarballPath);
   const blob = new Blob([fileData]);
   formData.append("source", blob, basename6(tarballPath));
   const resp = await fetch(`${portalURL}/publish`, {
@@ -10088,7 +10136,7 @@ function setVersionInFiles(root, oldVer, newVer) {
   for (const file of ["package.json", "space.manifest.json"]) {
     const path = join14(root, file);
     try {
-      const data = readFileSync7(path, "utf-8");
+      const data = readFileSync8(path, "utf-8");
       writeFileSync6(path, data.replace(oldStr, newStr));
     } catch {}
   }
@@ -10233,7 +10281,7 @@ async function publish(options) {
 
 // src/commands/validate.ts
 init_source();
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
 import { join as join15 } from "path";
 function validate3() {
   const root = process.cwd();
@@ -10253,21 +10301,21 @@ function validate3() {
   for (const page of m.pages) {
     const component = page.component || (page.path === "" ? "pages/index.vue" : `pages/${page.path}.vue`);
     const fullPath = join15(root, "src", component);
-    if (!existsSync11(fullPath)) {
+    if (!existsSync12(fullPath)) {
       console.log(source_default.yellow(`  \u26A0 Page component not found: src/${component}`));
       warnings++;
     }
   }
   if (m.agent) {
     const agentPath = join15(root, m.agent);
-    if (!existsSync11(agentPath)) {
+    if (!existsSync12(agentPath)) {
       console.log(source_default.yellow(`  \u26A0 Agent config not found: ${m.agent}`));
       warnings++;
     }
   }
   const pkgPath = join15(root, "package.json");
-  if (existsSync11(pkgPath)) {
-    const pkg = JSON.parse(readFileSync8(pkgPath, "utf-8"));
+  if (existsSync12(pkgPath)) {
+    const pkg = JSON.parse(readFileSync9(pkgPath, "utf-8"));
     if (pkg.version && pkg.version !== m.version) {
       console.log(source_default.yellow(`  \u26A0 Version mismatch: manifest=${m.version} package.json=${pkg.version}`));
       warnings++;
@@ -10283,7 +10331,7 @@ function validate3() {
 // src/commands/check.ts
 init_source();
 import { execSync as execSync4 } from "child_process";
-import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync10 } from "fs";
 import { join as join16 } from "path";
 function check() {
   const root = process.cwd();
@@ -10303,18 +10351,18 @@ function check() {
   let warnings = 0;
   for (const page of m.pages) {
     const component = page.component || (page.path === "" ? "pages/index.vue" : `pages/${page.path}.vue`);
-    if (!existsSync12(join16(root, "src", component))) {
+    if (!existsSync13(join16(root, "src", component))) {
       console.log(source_default.yellow(`  \u26A0 Page not found: src/${component}`));
       warnings++;
     }
   }
-  if (m.agent && !existsSync12(join16(root, m.agent))) {
+  if (m.agent && !existsSync13(join16(root, m.agent))) {
     console.log(source_default.yellow(`  \u26A0 Agent config not found: ${m.agent}`));
     warnings++;
   }
   const pkgPath = join16(root, "package.json");
-  if (existsSync12(pkgPath)) {
-    const pkg = JSON.parse(readFileSync9(pkgPath, "utf-8"));
+  if (existsSync13(pkgPath)) {
+    const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
     if (pkg.version && pkg.version !== m.version) {
       console.log(source_default.yellow(`  \u26A0 Version mismatch: manifest=${m.version} package.json=${pkg.version}`));
       warnings++;
@@ -10346,7 +10394,7 @@ function check() {
 
 // src/commands/clean.ts
 init_source();
-import { rmSync, existsSync as existsSync13 } from "fs";
+import { rmSync, existsSync as existsSync14 } from "fs";
 import { join as join17 } from "path";
 function clean(options) {
   const root = process.cwd();
@@ -10357,7 +10405,7 @@ function clean(options) {
   const lockfiles = ["bun.lockb", "package-lock.json", "yarn.lock", "pnpm-lock.yaml"];
   for (const dir of dirs) {
     const path = join17(root, dir);
-    if (existsSync13(path)) {
+    if (existsSync14(path)) {
       rmSync(path, { recursive: true });
       console.log(source_default.dim(`  Removed ${dir}/`));
     }
@@ -10365,7 +10413,7 @@ function clean(options) {
   if (options?.all) {
     for (const file of lockfiles) {
       const path = join17(root, file);
-      if (existsSync13(path)) {
+      if (existsSync14(path)) {
         rmSync(path);
         console.log(source_default.dim(`  Removed ${file}`));
       }
@@ -10420,7 +10468,7 @@ async function loginFromProfile(profiles) {
     name: picked.user?.name || picked.user?.username || picked.id,
     email: picked.user?.email || ""
   };
-  store({ token: picked.token, portal: DEFAULT_PORTAL, user });
+  store({ token: picked.token, portal: DEFAULT_PORTAL, user, profileId: picked.id });
   console.log(source_default.green(`Logged in as ${user.name}`));
   if (user.email)
     console.log(source_default.dim(`  ${user.email}`));
@@ -10513,7 +10561,7 @@ function update() {
 
 // src/commands/graph/init.ts
 init_source();
-import { existsSync as existsSync14, readFileSync as readFileSync10, writeFileSync as writeFileSync7, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync11, writeFileSync as writeFileSync7, mkdirSync as mkdirSync5 } from "fs";
 import { join as join18 } from "path";
 import { execSync as execSync6 } from "child_process";
 function graphInit() {
@@ -10527,7 +10575,7 @@ function graphInit() {
   const modelsDir = join18(root, "src", "models");
   mkdirSync5(modelsDir, { recursive: true });
   const indexPath = join18(modelsDir, "index.ts");
-  if (!existsSync14(indexPath)) {
+  if (!existsSync15(indexPath)) {
     writeFileSync7(indexPath, `// Data models for ${m.name}
 // Generated by construct graph init
 
@@ -10536,7 +10584,7 @@ function graphInit() {
 `);
   }
   const pkgPath = join18(root, "package.json");
-  const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+  const pkg = JSON.parse(readFileSync11(pkgPath, "utf-8"));
   if (!pkg.dependencies)
     pkg.dependencies = {};
   if (!pkg.dependencies["@construct-space/graph"]) {
@@ -10567,7 +10615,7 @@ function graphInit() {
 
 // src/commands/graph/generate.ts
 init_source();
-import { existsSync as existsSync15, readFileSync as readFileSync11, writeFileSync as writeFileSync8, mkdirSync as mkdirSync6 } from "fs";
+import { existsSync as existsSync16, readFileSync as readFileSync12, writeFileSync as writeFileSync8, mkdirSync as mkdirSync6 } from "fs";
 import { join as join19 } from "path";
 var FIELD_TYPES = {
   string: "field.string()",
@@ -10723,7 +10771,7 @@ function generate2(modelName, fieldSpecs, options) {
   const modelsDir = join19(root, "src", "models");
   mkdirSync6(modelsDir, { recursive: true });
   const filePath = join19(modelsDir, `${name}.ts`);
-  if (existsSync15(filePath)) {
+  if (existsSync16(filePath)) {
     console.log(source_default.yellow(`  Model file already exists: src/models/${name}.ts`));
     console.log(source_default.dim("  Overwriting..."));
   }
@@ -10742,8 +10790,8 @@ function generate2(modelName, fieldSpecs, options) {
 function updateBarrel(modelsDir, modelName) {
   const indexPath = join19(modelsDir, "index.ts");
   const exportLine = `export { ${modelName} } from './${modelName}'`;
-  if (existsSync15(indexPath)) {
-    const content = readFileSync11(indexPath, "utf-8");
+  if (existsSync16(indexPath)) {
+    const content = readFileSync12(indexPath, "utf-8");
     if (content.includes(exportLine))
       return;
     writeFileSync8(indexPath, content.trimEnd() + `
@@ -10758,7 +10806,7 @@ function updateBarrel(modelsDir, modelName) {
 
 // src/commands/graph/push.ts
 init_source();
-import { existsSync as existsSync16, readdirSync as readdirSync6, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync17, readdirSync as readdirSync6, readFileSync as readFileSync13 } from "fs";
 import { join as join20, basename as basename7 } from "path";
 init_auth();
 async function graphPush() {
@@ -10769,7 +10817,7 @@ async function graphPush() {
   }
   const m = read(root);
   const modelsDir = join20(root, "src", "models");
-  if (!existsSync16(modelsDir)) {
+  if (!existsSync17(modelsDir)) {
     console.error(source_default.red("No src/models/ directory found. Run 'construct graph init' first."));
     process.exit(1);
   }
@@ -10782,7 +10830,7 @@ async function graphPush() {
   console.log(source_default.blue(`Pushing ${modelFiles.length} model(s) for space: ${m.id}`));
   const models = [];
   for (const file of modelFiles) {
-    const content = readFileSync12(join20(modelsDir, file), "utf-8");
+    const content = readFileSync13(join20(modelsDir, file), "utf-8");
     const model = parseModelFile(content, basename7(file, ".ts"));
     if (model)
       models.push(model);
@@ -10813,7 +10861,10 @@ async function graphPush() {
       "X-Space-ID": m.id,
       "X-Auth-User-ID": userID
     };
-    const pushOrgID = process.env.CONSTRUCT_ORG_ID;
+    let pushOrgID = process.env.CONSTRUCT_ORG_ID || "";
+    if (!pushOrgID && creds.profileId?.startsWith("org:")) {
+      pushOrgID = creds.profileId.slice("org:".length);
+    }
     if (pushOrgID)
       headers["X-Auth-Org-ID"] = pushOrgID;
     const resp = await fetch(`${graphURL}/api/schemas/register`, {
@@ -10924,7 +10975,7 @@ function parseModelFile(content, fileName) {
 
 // src/commands/graph/migrate.ts
 init_source();
-import { existsSync as existsSync17, readdirSync as readdirSync7, readFileSync as readFileSync13 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync7, readFileSync as readFileSync14 } from "fs";
 import { join as join21, basename as basename8 } from "path";
 init_auth();
 async function graphMigrate(options) {
@@ -10935,7 +10986,7 @@ async function graphMigrate(options) {
   }
   const m = read(root);
   const modelsDir = join21(root, "src", "models");
-  if (!existsSync17(modelsDir)) {
+  if (!existsSync18(modelsDir)) {
     console.error(source_default.red("No src/models/ directory. Run 'construct graph init' first."));
     process.exit(1);
   }
@@ -10965,7 +11016,7 @@ async function graphMigrate(options) {
   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");
+    const content = readFileSync14(join21(modelsDir, file), "utf-8");
     const model = parseModelFields(content, basename8(file, ".ts"));
     if (model)
       localModels.push(model);
@@ -11070,7 +11121,7 @@ function parseModelFields(content, fileName) {
 // package.json
 var package_default = {
   name: "@construct-space/cli",
-  version: "1.4.4",
+  version: "1.5.0",
   description: "Construct CLI \u2014 scaffold, build, develop, and publish spaces",
   type: "module",
   bin: {

package/package.json

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