@construct-space/cli 1.4.5 → 1.5.1

package/dist/index.js

@@ -2790,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";
@@ -2810,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)) {
@@ -2835,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)
@@ -2864,14 +2887,47 @@ function store(creds) {
 }
 function load2() {
   const path = credentialsPath();
-  if (!existsSync9(path)) {
-    throw new Error("not logged in \u2014 run 'construct login' first");
+  if (existsSync10(path)) {
+    const data = JSON.parse(readFileSync7(path, "utf-8"));
+    if (data.token)
+      return data;
   }
-  const data = JSON.parse(readFileSync6(path, "utf-8"));
-  if (!data.token) {
-    throw new Error("not logged in \u2014 run 'construct login' first");
+  const fromProfile = loadFromActiveProfile();
+  if (fromProfile)
+    return fromProfile;
+  throw new Error("not logged in \u2014 run 'construct login' first");
+}
+function loadFromActiveProfile() {
+  try {
+    const regPath = join12(dataDir(), "profiles.json");
+    if (!existsSync10(regPath))
+      return null;
+    const reg = JSON.parse(readFileSync7(regPath, "utf-8"));
+    const activeId = reg.active_profile;
+    if (!activeId)
+      return null;
+    const authPath = join12(profilesDir(), activeId, "auth.json");
+    if (!existsSync10(authPath))
+      return null;
+    const a = JSON.parse(readFileSync7(authPath, "utf-8"));
+    if (!a.token)
+      return null;
+    if (a.authenticated === false)
+      return null;
+    const u = a.user || {};
+    return {
+      token: a.token,
+      portal: DEFAULT_PORTAL,
+      profileId: activeId,
+      user: {
+        id: u.id || u.uuid || activeId,
+        name: u.name || u.username || activeId,
+        email: u.email || ""
+      }
+    };
+  } catch {
+    return null;
   }
-  return data;
 }
 function isAuthenticated() {
   try {
@@ -2883,7 +2939,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";
@@ -2955,7 +3011,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 {
@@ -7941,8 +8005,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)
@@ -8282,16 +8346,16 @@ import { existsSync as existsSync7, readFileSync as readFileSync5 } from "fs";
 import { join as join9 } from "path";
 import { createHash as createHash2 } from "crypto";
 
-// node_modules/chokidar/esm/index.js
-import { stat as statcb } from "fs";
-import { stat as stat3, readdir as readdir2 } from "fs/promises";
+// node_modules/chokidar/index.js
 import { EventEmitter } from "events";
-import * as sysPath2 from "path";
+import { stat as statcb, Stats } from "fs";
+import { readdir as readdir2, stat as stat3 } from "fs/promises";
+import * as sp2 from "path";
 
-// node_modules/readdirp/esm/index.js
-import { stat, lstat, readdir, realpath } from "fs/promises";
+// node_modules/readdirp/index.js
+import { lstat, readdir, realpath, stat } from "fs/promises";
+import { join as pjoin, relative as prelative, resolve as presolve, sep as psep } from "path";
 import { Readable } from "stream";
-import { resolve as presolve, relative as prelative, join as pjoin, sep as psep } from "path";
 var EntryTypes = {
   FILE_TYPE: "files",
   DIR_TYPE: "directories",
@@ -8347,6 +8411,20 @@ var normalizeFilter = (filter) => {
 };
 
 class ReaddirpStream extends Readable {
+  parents;
+  reading;
+  parent;
+  _stat;
+  _maxDepth;
+  _wantsDir;
+  _wantsFile;
+  _wantsEverything;
+  _root;
+  _isDirent;
+  _statsProp;
+  _rdOptions;
+  _fileFilter;
+  _directoryFilter;
   constructor(options = {}) {
     super({
       objectMode: true,
@@ -8363,7 +8441,7 @@ class ReaddirpStream extends Readable {
     } else {
       this._stat = statMethod;
     }
-    this._maxDepth = opts.depth ?? defaultOptions.depth;
+    this._maxDepth = opts.depth != null && Number.isSafeInteger(opts.depth) ? opts.depth : defaultOptions.depth;
     this._wantsDir = type ? DIR_TYPES.has(type) : false;
     this._wantsFile = type ? FILE_TYPES.has(type) : false;
     this._wantsEverything = type === EntryTypes.EVERYTHING_TYPE;
@@ -8508,11 +8586,11 @@ function readdirp(root, options = {}) {
   return new ReaddirpStream(options);
 }
 
-// node_modules/chokidar/esm/handler.js
-import { watchFile, unwatchFile, watch as fs_watch } from "fs";
-import { open, stat as stat2, lstat as lstat2, realpath as fsrealpath } from "fs/promises";
-import * as sysPath from "path";
+// node_modules/chokidar/handler.js
+import { watch as fs_watch, unwatchFile, watchFile } from "fs";
+import { realpath as fsrealpath, lstat as lstat2, open, stat as stat2 } from "fs/promises";
 import { type as osType } from "os";
+import * as sp from "path";
 var STR_DATA = "data";
 var STR_END = "end";
 var STR_CLOSE = "close";
@@ -8804,7 +8882,7 @@ var binaryExtensions = new Set([
   "zip",
   "zipx"
 ]);
-var isBinaryPath = (filePath) => binaryExtensions.has(sysPath.extname(filePath).slice(1).toLowerCase());
+var isBinaryPath = (filePath) => binaryExtensions.has(sp.extname(filePath).slice(1).toLowerCase());
 var foreach = (val, fn) => {
   if (val instanceof Set) {
     val.forEach(fn);
@@ -8842,7 +8920,7 @@ function createFsWatchInstance(path, options, listener, errHandler, emitRaw) {
     listener(path);
     emitRaw(rawEvent, evPath, { watchedPath: path });
     if (evPath && path !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path, evPath), KEY_LISTENERS, sysPath.join(path, evPath));
+      fsWatchBroadcast(sp.resolve(path, evPath), KEY_LISTENERS, sp.join(path, evPath));
     }
   };
   try {
@@ -8957,17 +9035,19 @@ var setFsWatchFileListener = (path, fullPath, options, handlers) => {
 };
 
 class NodeFsHandler {
+  fsw;
+  _boundHandleError;
   constructor(fsW) {
     this.fsw = fsW;
     this._boundHandleError = (error2) => fsW._handleError(error2);
   }
   _watchWithNodeFs(path, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path);
-    const basename4 = sysPath.basename(path);
+    const directory = sp.dirname(path);
+    const basename4 = sp.basename(path);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename4);
-    const absolutePath = sysPath.resolve(path);
+    const absolutePath = sp.resolve(path);
     const options = {
       persistent: opts.persistent
     };
@@ -8994,8 +9074,8 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname3 = sysPath.dirname(file);
-    const basename4 = sysPath.basename(file);
+    const dirname3 = sp.dirname(file);
+    const basename4 = sp.basename(file);
     const parent = this.fsw._getWatchedDir(dirname3);
     let prevStats = stats;
     if (parent.has(basename4))
@@ -9078,8 +9158,9 @@ class NodeFsHandler {
     this.fsw._symlinkPaths.set(full, true);
   }
   _handleRead(directory, initialAdd, wh, target, dir, depth, throttler) {
-    directory = sysPath.join(directory, "");
-    throttler = this.fsw._throttle("readdir", directory, 1000);
+    directory = sp.join(directory, "");
+    const throttleKey = target ? `${directory}:${target}` : directory;
+    throttler = this.fsw._throttle("readdir", throttleKey, 1000);
     if (!throttler)
       return;
     const previous = this.fsw._getWatchedDir(wh.path);
@@ -9096,7 +9177,7 @@ class NodeFsHandler {
         return;
       }
       const item = entry.path;
-      let path = sysPath.join(directory, item);
+      let path = sp.join(directory, item);
       current.add(item);
       if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path, item)) {
         return;
@@ -9107,7 +9188,7 @@ class NodeFsHandler {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path = sysPath.join(dir, sysPath.relative(dir, path));
+        path = sp.join(dir, sp.relative(dir, path));
         this._addToNodeFs(path, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
@@ -9133,12 +9214,12 @@ class NodeFsHandler {
     });
   }
   async _handleDir(dir, stats, initialAdd, depth, target, wh, realpath2) {
-    const parentDir = this.fsw._getWatchedDir(sysPath.dirname(dir));
-    const tracked = parentDir.has(sysPath.basename(dir));
+    const parentDir = this.fsw._getWatchedDir(sp.dirname(dir));
+    const tracked = parentDir.has(sp.basename(dir));
     if (!(initialAdd && this.fsw.options.ignoreInitial) && !target && !tracked) {
       this.fsw._emit(EV.ADD_DIR, dir, stats);
     }
-    parentDir.add(sysPath.basename(dir));
+    parentDir.add(sp.basename(dir));
     this.fsw._getWatchedDir(dir);
     let throttler;
     let closer;
@@ -9179,7 +9260,7 @@ class NodeFsHandler {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path);
+        const absPath = sp.resolve(path);
         const targetPath = follow ? await fsrealpath(path) : path;
         if (this.fsw.closed)
           return;
@@ -9193,14 +9274,14 @@ class NodeFsHandler {
         const targetPath = follow ? await fsrealpath(path) : path;
         if (this.fsw.closed)
           return;
-        const parent = sysPath.dirname(wh.watchPath);
+        const parent = sp.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
         closer = await this._handleDir(parent, stats, initialAdd, depth, path, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== undefined) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path), targetPath);
+          this.fsw._symlinkPaths.set(sp.resolve(path), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
@@ -9218,7 +9299,7 @@ class NodeFsHandler {
   }
 }
 
-// node_modules/chokidar/esm/index.js
+// node_modules/chokidar/index.js
 /*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) */
 var SLASH = "/";
 var SLASH_SLASH = "//";
@@ -9226,7 +9307,7 @@ var ONE_DOT = ".";
 var TWO_DOTS = "..";
 var STRING_TYPE = "string";
 var BACK_SLASH_RE = /\\/g;
-var DOUBLE_SLASH_RE = /\/\//;
+var DOUBLE_SLASH_RE = /\/\//g;
 var DOT_RE = /\..*\.(sw[px])$|~$|\.subl.*\.tmp/;
 var REPLACER_RE = /^\.[/\\]/;
 function arrify(item) {
@@ -9245,11 +9326,11 @@ function createPattern(matcher) {
       if (matcher.path === string)
         return true;
       if (matcher.recursive) {
-        const relative4 = sysPath2.relative(matcher.path, string);
+        const relative4 = sp2.relative(matcher.path, string);
         if (!relative4) {
           return false;
         }
-        return !relative4.startsWith("..") && !sysPath2.isAbsolute(relative4);
+        return !relative4.startsWith("..") && !sp2.isAbsolute(relative4);
       }
       return false;
     };
@@ -9259,14 +9340,12 @@ function createPattern(matcher) {
 function normalizePath(path) {
   if (typeof path !== "string")
     throw new Error("string expected");
-  path = sysPath2.normalize(path);
+  path = sp2.normalize(path);
   path = path.replace(/\\/g, "/");
   let prepend = false;
   if (path.startsWith("//"))
     prepend = true;
-  const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path.match(DOUBLE_SLASH_RE2))
-    path = path.replace(DOUBLE_SLASH_RE2, "/");
+  path = path.replace(DOUBLE_SLASH_RE, "/");
   if (prepend)
     path = "/" + path;
   return path;
@@ -9307,31 +9386,32 @@ var toUnix = (string) => {
   if (str.startsWith(SLASH_SLASH)) {
     prepend = true;
   }
-  while (str.match(DOUBLE_SLASH_RE)) {
-    str = str.replace(DOUBLE_SLASH_RE, SLASH);
-  }
+  str = str.replace(DOUBLE_SLASH_RE, SLASH);
   if (prepend) {
     str = SLASH + str;
   }
   return str;
 };
-var normalizePathToUnix = (path) => toUnix(sysPath2.normalize(toUnix(path)));
+var normalizePathToUnix = (path) => toUnix(sp2.normalize(toUnix(path)));
 var normalizeIgnored = (cwd = "") => (path) => {
   if (typeof path === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path) ? path : sysPath2.join(cwd, path));
+    return normalizePathToUnix(sp2.isAbsolute(path) ? path : sp2.join(cwd, path));
   } else {
     return path;
   }
 };
 var getAbsolutePath = (path, cwd) => {
-  if (sysPath2.isAbsolute(path)) {
+  if (sp2.isAbsolute(path)) {
     return path;
   }
-  return sysPath2.join(cwd, path);
+  return sp2.join(cwd, path);
 };
 var EMPTY_SET = Object.freeze(new Set);
 
 class DirEntry {
+  path;
+  _removeWatcher;
+  items;
   constructor(dir, removeWatcher) {
     this.path = dir;
     this._removeWatcher = removeWatcher;
@@ -9356,7 +9436,7 @@ class DirEntry {
       await readdir2(dir);
     } catch (err) {
       if (this._removeWatcher) {
-        this._removeWatcher(sysPath2.dirname(dir), sysPath2.basename(dir));
+        this._removeWatcher(sp2.dirname(dir), sp2.basename(dir));
       }
     }
   }
@@ -9384,12 +9464,19 @@ var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 
 class WatchHelper {
+  fsw;
+  path;
+  watchPath;
+  fullWatchPath;
+  dirParts;
+  followSymlinks;
+  statMethod;
   constructor(path, follow, fsw) {
     this.fsw = fsw;
     const watchPath = path;
     this.path = path = path.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
-    this.fullWatchPath = sysPath2.resolve(watchPath);
+    this.fullWatchPath = sp2.resolve(watchPath);
     this.dirParts = [];
     this.dirParts.forEach((parts) => {
       if (parts.length > 1)
@@ -9399,7 +9486,7 @@ class WatchHelper {
     this.statMethod = follow ? STAT_METHOD_F : STAT_METHOD_L;
   }
   entryPath(entry) {
-    return sysPath2.join(this.watchPath, sysPath2.relative(this.watchPath, entry.fullPath));
+    return sp2.join(this.watchPath, sp2.relative(this.watchPath, entry.fullPath));
   }
   filterPath(entry) {
     const { stats } = entry;
@@ -9414,6 +9501,24 @@ class WatchHelper {
 }
 
 class FSWatcher extends EventEmitter {
+  closed;
+  options;
+  _closers;
+  _ignoredPaths;
+  _throttled;
+  _streams;
+  _symlinkPaths;
+  _watched;
+  _pendingWrites;
+  _pendingUnlinks;
+  _readyCount;
+  _emitReady;
+  _closePromise;
+  _userIgnored;
+  _readyEmitted;
+  _emitRaw;
+  _boundRemove;
+  _nodeFsHandler;
   constructor(_opts = {}) {
     super();
     this.closed = false;
@@ -9522,7 +9627,7 @@ class FSWatcher extends EventEmitter {
         return;
       results.forEach((item) => {
         if (item)
-          this.add(sysPath2.dirname(item), sysPath2.basename(_origAdd || item));
+          this.add(sp2.dirname(item), sp2.basename(_origAdd || item));
       });
     });
     return this;
@@ -9533,10 +9638,10 @@ class FSWatcher extends EventEmitter {
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
     paths.forEach((path) => {
-      if (!sysPath2.isAbsolute(path) && !this._closers.has(path)) {
+      if (!sp2.isAbsolute(path) && !this._closers.has(path)) {
         if (cwd)
-          path = sysPath2.join(cwd, path);
-        path = sysPath2.resolve(path);
+          path = sp2.join(cwd, path);
+        path = sp2.resolve(path);
       }
       this._closePath(path);
       this._addIgnoredPath(path);
@@ -9580,7 +9685,7 @@ class FSWatcher extends EventEmitter {
   getWatched() {
     const watchList = {};
     this._watched.forEach((entry, dir) => {
-      const key = this.options.cwd ? sysPath2.relative(this.options.cwd, dir) : dir;
+      const key = this.options.cwd ? sp2.relative(this.options.cwd, dir) : dir;
       const index = key || ONE_DOT;
       watchList[index] = entry.getChildren().sort();
     });
@@ -9596,9 +9701,9 @@ class FSWatcher extends EventEmitter {
       return;
     const opts = this.options;
     if (isWindows)
-      path = sysPath2.normalize(path);
+      path = sp2.normalize(path);
     if (opts.cwd)
-      path = sysPath2.relative(opts.cwd, path);
+      path = sp2.relative(opts.cwd, path);
     const args = [path];
     if (stats != null)
       args.push(stats);
@@ -9649,7 +9754,7 @@ class FSWatcher extends EventEmitter {
         return this;
     }
     if (opts.alwaysStat && stats === undefined && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path) : path;
+      const fullPath = opts.cwd ? sp2.join(opts.cwd, path) : path;
       let stats2;
       try {
         stats2 = await stat3(fullPath);
@@ -9705,8 +9810,8 @@ class FSWatcher extends EventEmitter {
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
     let fullPath = path;
-    if (this.options.cwd && !sysPath2.isAbsolute(path)) {
-      fullPath = sysPath2.join(this.options.cwd, path);
+    if (this.options.cwd && !sp2.isAbsolute(path)) {
+      fullPath = sp2.join(this.options.cwd, path);
     }
     const now = new Date;
     const writes = this._pendingWrites;
@@ -9763,7 +9868,7 @@ class FSWatcher extends EventEmitter {
     return new WatchHelper(path, this.options.followSymlinks, this);
   }
   _getWatchedDir(directory) {
-    const dir = sysPath2.resolve(directory);
+    const dir = sp2.resolve(directory);
     if (!this._watched.has(dir))
       this._watched.set(dir, new DirEntry(dir, this._boundRemove));
     return this._watched.get(dir);
@@ -9774,8 +9879,8 @@ class FSWatcher extends EventEmitter {
     return Boolean(Number(stats.mode) & 256);
   }
   _remove(directory, item, isDirectory) {
-    const path = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path);
+    const path = sp2.join(directory, item);
+    const fullPath = sp2.resolve(path);
     isDirectory = isDirectory != null ? isDirectory : this._watched.has(path) || this._watched.has(fullPath);
     if (!this._throttle("remove", path, 100))
       return;
@@ -9793,7 +9898,7 @@ class FSWatcher extends EventEmitter {
     }
     let relPath = path;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path);
+      relPath = sp2.relative(this.options.cwd, path);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
@@ -9808,8 +9913,8 @@ class FSWatcher extends EventEmitter {
   }
   _closePath(path) {
     this._closeFile(path);
-    const dir = sysPath2.dirname(path);
-    this._getWatchedDir(dir).remove(sysPath2.basename(path));
+    const dir = sp2.dirname(path);
+    this._getWatchedDir(dir).remove(sp2.basename(path));
   }
   _closeFile(path) {
     const closers = this._closers.get(path);
@@ -9923,7 +10028,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() {
@@ -9933,13 +10038,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);
@@ -9951,12 +10056,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";
@@ -9995,7 +10100,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)) {
@@ -10009,10 +10114,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");
   }
@@ -10030,7 +10135,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`, {
@@ -10064,7 +10169,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 {}
   }
@@ -10209,7 +10314,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();
@@ -10229,21 +10334,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++;
@@ -10259,7 +10364,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();
@@ -10279,18 +10384,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++;
@@ -10322,7 +10427,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();
@@ -10333,7 +10438,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}/`));
     }
@@ -10341,7 +10446,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}`));
       }
@@ -10396,7 +10501,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}`));
@@ -10489,7 +10594,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() {
@@ -10503,7 +10608,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
 
@@ -10512,7 +10617,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"]) {
@@ -10543,7 +10648,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()",
@@ -10699,7 +10804,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..."));
   }
@@ -10718,8 +10823,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() + `
@@ -10734,7 +10839,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() {
@@ -10745,7 +10850,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);
   }
@@ -10758,7 +10863,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);
@@ -10789,7 +10894,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`, {
@@ -10891,16 +10999,24 @@ function parseModelFile(content, fileName) {
     const [, op, level] = accessMatch;
     accessRules[op] = level;
   }
+  let scope;
+  const scopeMatch = content.match(/scope\s*:\s*['"](app|project|org)['"]/);
+  if (scopeMatch)
+    scope = scopeMatch[1];
   const result = { name: modelName, fields };
-  if (Object.keys(accessRules).length > 0) {
-    result.options = { access: accessRules };
+  if (Object.keys(accessRules).length > 0 || scope) {
+    result.options = {};
+    if (Object.keys(accessRules).length > 0)
+      result.options.access = accessRules;
+    if (scope)
+      result.options.scope = scope;
   }
   return result;
 }
 
 // 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) {
@@ -10911,7 +11027,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);
   }
@@ -10941,7 +11057,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);
@@ -11046,7 +11162,7 @@ function parseModelFields(content, fileName) {
 // package.json
 var package_default = {
   name: "@construct-space/cli",
-  version: "1.4.5",
+  version: "1.5.1",
   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.5",
+  "version": "1.5.1",
   "description": "Construct CLI — scaffold, build, develop, and publish spaces",
   "type": "module",
   "bin": {