roboto-js 3.0.0 → 3.0.1

package/dist/esm/rbt_api.js

@@ -28,6 +28,30 @@ import RbtUser from './rbt_user.js';
 import RbtFile from './rbt_file.js';
 import _ from 'lodash';
 import { openDB } from 'idb';
+
+/** IAC working org preference lives under module-scoped settings (`mod.iac`). Legacy reads still honor `mod.currentOrgId`. */
+var USER_MOD_CURRENT_ORG_IAC = 'mod.iac.currentOrgId';
+var USER_MOD_CURRENT_ORG_LEGACY = 'mod.currentOrgId';
+
+/** @param {import('./rbt_user.js').default|null|undefined} user */
+function readUserCurrentOrgPreference(user) {
+  var _$get;
+  if (!user || typeof user.get !== 'function') return '';
+  var v = user.get(USER_MOD_CURRENT_ORG_IAC);
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+  v = user.get(USER_MOD_CURRENT_ORG_LEGACY);
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+  var d = typeof user.getData === 'function' ? user.getData() : {};
+  v = (_$get = _.get(d, 'mod.iac.currentOrgId')) !== null && _$get !== void 0 ? _$get : _.get(d, 'mod.currentOrgId');
+  if (v != null && String(v).trim() !== '') return String(v).trim();
+  return '';
+}
+
+/** @param {import('./rbt_user.js').default} user */
+function persistUserCurrentOrgPreference(user, orgId) {
+  if (!(user !== null && user !== void 0 && user.set) || orgId == null || String(orgId).trim() === '') return;
+  user.set(USER_MOD_CURRENT_ORG_IAC, String(orgId).trim());
+}
 var RbtApi = /*#__PURE__*/function () {
   function RbtApi(_ref) {
     var baseUrl = _ref.baseUrl,
@@ -737,94 +761,254 @@ var RbtApi = /*#__PURE__*/function () {
       }
       return loadCurrentUser;
     }()
+    /**
+     * Confirm email with either legacy composite string or { email, code } (6-digit from mod-iac-flows).
+     * @param {string|{ email: string, code: string }|{ emailConfirmCode: string }} confirmCodeOrParams
+     */
   }, {
     key: "confirmUserEmail",
-    value: function () {
-      var _confirmUserEmail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(confirmCode) {
-        var params, response;
+    value: (function () {
+      var _confirmUserEmail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(confirmCodeOrParams) {
+        var params, email, code, emailConfirmCode, err, _err, response;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
+              if (!(typeof confirmCodeOrParams === 'string')) {
+                _context11.next = 4;
+                break;
+              }
               params = {
-                emailConfirmCode: confirmCode
+                emailConfirmCode: confirmCodeOrParams
               };
-              _context11.prev = 1;
-              _context11.next = 4;
-              return this.axios.post('/api/iac/confirmUserEmail', [params]);
+              _context11.next = 20;
+              break;
             case 4:
+              if (!(confirmCodeOrParams && _typeof(confirmCodeOrParams) === 'object')) {
+                _context11.next = 18;
+                break;
+              }
+              email = confirmCodeOrParams.email, code = confirmCodeOrParams.code, emailConfirmCode = confirmCodeOrParams.emailConfirmCode;
+              if (!(email && code != null && String(code).length > 0)) {
+                _context11.next = 10;
+                break;
+              }
+              params = {
+                email: email,
+                code: String(code)
+              };
+              _context11.next = 16;
+              break;
+            case 10:
+              if (!emailConfirmCode) {
+                _context11.next = 14;
+                break;
+              }
+              params = {
+                emailConfirmCode: emailConfirmCode
+              };
+              _context11.next = 16;
+              break;
+            case 14:
+              err = new Error('confirmUserEmail: pass a legacy string, { emailConfirmCode }, or { email, code }');
+              return _context11.abrupt("return", this._handleError(err));
+            case 16:
+              _context11.next = 20;
+              break;
+            case 18:
+              _err = new Error('confirmUserEmail: invalid argument');
+              return _context11.abrupt("return", this._handleError(_err));
+            case 20:
+              _context11.prev = 20;
+              _context11.next = 23;
+              return this.axios.post('/api/iac/confirmUserEmail', [params]);
+            case 23:
               response = _context11.sent;
               if (!(response.data.ok === false)) {
-                _context11.next = 7;
+                _context11.next = 26;
                 break;
               }
               return _context11.abrupt("return", this._handleError(response));
-            case 7:
+            case 26:
               return _context11.abrupt("return", response.data);
-            case 10:
-              _context11.prev = 10;
-              _context11.t0 = _context11["catch"](1);
+            case 29:
+              _context11.prev = 29;
+              _context11.t0 = _context11["catch"](20);
               return _context11.abrupt("return", this._handleError(_context11.t0));
-            case 13:
+            case 32:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[1, 10]]);
+        }, _callee11, this, [[20, 29]]);
       }));
       function confirmUserEmail(_x6) {
         return _confirmUserEmail.apply(this, arguments);
       }
       return confirmUserEmail;
+    }() /** Password reset email — use mod-iac-flows (not deprecated /api/iac/sendPasswordReset). */)
+  }, {
+    key: "sendResetEmailViaFlows",
+    value: (function () {
+      var _sendResetEmailViaFlows = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(email) {
+        var response;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              _context12.next = 2;
+              return this.axios.post('/api/iac-flows/sendResetEmail', {
+                email: email
+              });
+            case 2:
+              response = _context12.sent;
+              return _context12.abrupt("return", response.data);
+            case 4:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this);
+      }));
+      function sendResetEmailViaFlows(_x7) {
+        return _sendResetEmailViaFlows.apply(this, arguments);
+      }
+      return sendResetEmailViaFlows;
+    }())
+  }, {
+    key: "sendRegistrationVerificationEmail",
+    value: function () {
+      var _sendRegistrationVerificationEmail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(email) {
+        var response;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              _context13.next = 2;
+              return this.axios.post('/api/iac-flows/sendRegistrationVerification', {
+                email: email
+              });
+            case 2:
+              response = _context13.sent;
+              return _context13.abrupt("return", response.data);
+            case 4:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function sendRegistrationVerificationEmail(_x8) {
+        return _sendRegistrationVerificationEmail.apply(this, arguments);
+      }
+      return sendRegistrationVerificationEmail;
+    }()
+  }, {
+    key: "resendRegistrationCode",
+    value: function () {
+      var _resendRegistrationCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(email) {
+        var response;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              _context14.next = 2;
+              return this.axios.post('/api/iac-flows/resendRegistrationCode', {
+                email: email
+              });
+            case 2:
+              response = _context14.sent;
+              return _context14.abrupt("return", response.data);
+            case 4:
+            case "end":
+              return _context14.stop();
+          }
+        }, _callee14, this);
+      }));
+      function resendRegistrationCode(_x9) {
+        return _resendRegistrationCode.apply(this, arguments);
+      }
+      return resendRegistrationCode;
+    }()
+  }, {
+    key: "completePasswordReset",
+    value: function () {
+      var _completePasswordReset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(_ref3) {
+        var _response$data;
+        var email, code, newPassword, response;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
+            case 0:
+              email = _ref3.email, code = _ref3.code, newPassword = _ref3.newPassword;
+              _context15.next = 3;
+              return this.axios.post('/api/iac/completePasswordReset', [{
+                email: email,
+                code: code,
+                newPassword: newPassword
+              }]);
+            case 3:
+              response = _context15.sent;
+              if (!(((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.ok) === false)) {
+                _context15.next = 6;
+                break;
+              }
+              return _context15.abrupt("return", this._handleError(response));
+            case 6:
+              return _context15.abrupt("return", response.data);
+            case 7:
+            case "end":
+              return _context15.stop();
+          }
+        }, _callee15, this);
+      }));
+      function completePasswordReset(_x10) {
+        return _completePasswordReset.apply(this, arguments);
+      }
+      return completePasswordReset;
     }()
   }, {
     key: "loadCurrentUserExtended",
     value: function () {
-      var _loadCurrentUserExtended = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _loadCurrentUserExtended = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (!this._loadCurrentUserExtendedPromise) {
-                _context13.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context13.abrupt("return", this._loadCurrentUserExtendedPromise);
+              return _context17.abrupt("return", this._loadCurrentUserExtendedPromise);
             case 2:
-              this._loadCurrentUserExtendedPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+              this._loadCurrentUserExtendedPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
                 var currentUser;
-                return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-                  while (1) switch (_context12.prev = _context12.next) {
+                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+                  while (1) switch (_context16.prev = _context16.next) {
                     case 0:
-                      _context12.next = 2;
+                      _context16.next = 2;
                       return _this3.loadCurrentUser();
                     case 2:
-                      currentUser = _context12.sent;
+                      currentUser = _context16.sent;
                       if (!currentUser) {
-                        _context12.next = 7;
+                        _context16.next = 7;
                         break;
                       }
-                      return _context12.abrupt("return", _this3.loadUser(currentUser.id));
+                      return _context16.abrupt("return", _this3.loadUser(currentUser.id));
                     case 7:
-                      return _context12.abrupt("return", null);
+                      return _context16.abrupt("return", null);
                     case 8:
                     case "end":
-                      return _context12.stop();
+                      return _context16.stop();
                   }
-                }, _callee12);
+                }, _callee16);
               }))();
-              _context13.prev = 3;
-              _context13.next = 6;
+              _context17.prev = 3;
+              _context17.next = 6;
               return this._loadCurrentUserExtendedPromise;
             case 6:
-              return _context13.abrupt("return", _context13.sent);
+              return _context17.abrupt("return", _context17.sent);
             case 7:
-              _context13.prev = 7;
+              _context17.prev = 7;
               this._loadCurrentUserExtendedPromise = null;
-              return _context13.finish(7);
+              return _context17.finish(7);
             case 10:
             case "end":
-              return _context13.stop();
+              return _context17.stop();
           }
-        }, _callee13, this, [[3,, 7, 10]]);
+        }, _callee17, this, [[3,, 7, 10]]);
       }));
       function loadCurrentUserExtended() {
         return _loadCurrentUserExtended.apply(this, arguments);
@@ -832,127 +1016,140 @@ var RbtApi = /*#__PURE__*/function () {
       return loadCurrentUserExtended;
     }()
     /**
-     * Load current organization for the authenticated user
-     * Organization is determined by:
-     * 1. User's mod.currentOrgId preference
-     * 2. First organization in user.organizations array
-     * 3. null if user has no organizations
-     * 
-     * @param {boolean} forceReload - Force reload from server even if cached
+     * Load current organization for the authenticated user.
+     *
+     * Returns an organization **only when** `user.mod.iac.currentOrgId` is set (explicit selection via
+     * `switchOrganization` / `selectCurrentOrganization`; legacy reads also accept `mod.currentOrgId`).
+     * There is no fallback to “first org”; callers must guide the user to select an org first.
+     *
+     * @param {boolean} forceReload - Force reload from server even if cached ID matches preference
      * @returns {Promise<RbtObject|null>} Organization object or null
      */
   }, {
     key: "loadCurrentOrganization",
     value: (function () {
-      var _loadCurrentOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _loadCurrentOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var _this4 = this;
         var forceReload,
           result,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args19 = arguments;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              forceReload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : false;
-              _context15.prev = 1;
-              if (!(this.currentOrganization && !forceReload)) {
-                _context15.next = 4;
-                break;
-              }
-              return _context15.abrupt("return", this.currentOrganization);
-            case 4:
+              forceReload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : false;
+              _context19.prev = 1;
               if (!this._loadCurrentOrgPromise) {
-                _context15.next = 6;
+                _context19.next = 4;
                 break;
               }
-              return _context15.abrupt("return", this._loadCurrentOrgPromise);
-            case 6:
-              this._loadCurrentOrgPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-                var _userData$organizatio, _userData$mod, user, userData, firstOrg, orgId, cachedOrgId, org;
-                return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-                  while (1) switch (_context14.prev = _context14.next) {
+              return _context19.abrupt("return", this._loadCurrentOrgPromise);
+            case 4:
+              this._loadCurrentOrgPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+                var user, orgId, cachedOrgId, org;
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                  while (1) switch (_context18.prev = _context18.next) {
                     case 0:
-                      _context14.prev = 0;
-                      _context14.next = 3;
+                      _context18.prev = 0;
+                      _context18.next = 3;
                       return _this4.loadCurrentUser();
                     case 3:
-                      user = _context14.sent;
+                      user = _context18.sent;
                       if (user) {
-                        _context14.next = 6;
+                        _context18.next = 7;
                         break;
                       }
-                      return _context14.abrupt("return", null);
-                    case 6:
-                      // Get organization ID from user preferences or first org
-                      userData = user.getData(); // organizations array format: [{ id: 'org123', roles: ['owner'] }, ...]
-                      firstOrg = (_userData$organizatio = userData.organizations) === null || _userData$organizatio === void 0 ? void 0 : _userData$organizatio[0];
-                      orgId = ((_userData$mod = userData.mod) === null || _userData$mod === void 0 ? void 0 : _userData$mod.currentOrgId) || (_typeof(firstOrg) === 'object' ? firstOrg === null || firstOrg === void 0 ? void 0 : firstOrg.id : firstOrg);
+                      _this4.currentOrganization = null;
+                      return _context18.abrupt("return", null);
+                    case 7:
+                      orgId = readUserCurrentOrgPreference(user);
                       if (orgId) {
-                        _context14.next = 11;
+                        _context18.next = 19;
                         break;
                       }
-                      return _context14.abrupt("return", null);
-                    case 11:
+                      //console.log('[RbtApi] No current organization selected (mod.iac.currentOrgId unset)');
+                      _this4.currentOrganization = null;
                       if (!_this4.localStorageAdaptor) {
-                        _context14.next = 16;
+                        _context18.next = 18;
                         break;
                       }
-                      _context14.next = 14;
-                      return _this4.localStorageAdaptor.getItem('currentOrgId');
+                      _context18.prev = 11;
+                      _context18.next = 14;
+                      return _this4.localStorageAdaptor.removeItem('currentOrgId');
                     case 14:
-                      cachedOrgId = _context14.sent;
-                      if (cachedOrgId && cachedOrgId !== orgId) {}
+                      _context18.next = 18;
+                      break;
                     case 16:
-                      _context14.next = 18;
-                      return _this4.get('<@iac.organization>', orgId);
+                      _context18.prev = 16;
+                      _context18.t0 = _context18["catch"](11);
                     case 18:
-                      org = _context14.sent;
+                      return _context18.abrupt("return", null);
+                    case 19:
+                      if (!(!forceReload && _this4.currentOrganization && String(_this4.currentOrganization.id) === orgId)) {
+                        _context18.next = 21;
+                        break;
+                      }
+                      return _context18.abrupt("return", _this4.currentOrganization);
+                    case 21:
+                      if (!_this4.localStorageAdaptor) {
+                        _context18.next = 26;
+                        break;
+                      }
+                      _context18.next = 24;
+                      return _this4.localStorageAdaptor.getItem('currentOrgId');
+                    case 24:
+                      cachedOrgId = _context18.sent;
+                      if (cachedOrgId && cachedOrgId !== orgId) {}
+                    case 26:
+                      _context18.next = 28;
+                      return _this4.load('<@iac.organization>', orgId);
+                    case 28:
+                      org = _context18.sent;
                       if (!org) {
-                        _context14.next = 26;
+                        _context18.next = 36;
                         break;
                       }
-                      _this4.currentOrganization = org; // Already an RbtObject
-                      //console.log('[RbtApi] Current organization loaded:', org.get('name'));
-
-                      // Cache in storage if available
+                      _this4.currentOrganization = org;
                       if (!_this4.localStorageAdaptor) {
-                        _context14.next = 24;
+                        _context18.next = 34;
                         break;
                       }
-                      _context14.next = 24;
+                      _context18.next = 34;
                       return _this4.localStorageAdaptor.setItem('currentOrgId', orgId);
-                    case 24:
-                      _context14.next = 26;
+                    case 34:
+                      _context18.next = 37;
                       break;
-                    case 26:
-                      return _context14.abrupt("return", _this4.currentOrganization);
-                    case 29:
-                      _context14.prev = 29;
-                      _context14.t0 = _context14["catch"](0);
-                      console.error('[RbtApi] Failed to load current organization:', _context14.t0);
+                    case 36:
                       _this4.currentOrganization = null;
-                      return _context14.abrupt("return", null);
-                    case 34:
+                    case 37:
+                      return _context18.abrupt("return", _this4.currentOrganization);
+                    case 40:
+                      _context18.prev = 40;
+                      _context18.t1 = _context18["catch"](0);
+                      console.error('[RbtApi] Failed to load current organization:', _context18.t1);
+                      _this4.currentOrganization = null;
+                      return _context18.abrupt("return", null);
+                    case 45:
                     case "end":
-                      return _context14.stop();
+                      return _context18.stop();
                   }
-                }, _callee14, null, [[0, 29]]);
+                }, _callee18, null, [[0, 40], [11, 16]]);
               }))();
-              _context15.next = 9;
+              _context19.next = 7;
               return this._loadCurrentOrgPromise;
-            case 9:
-              result = _context15.sent;
+            case 7:
+              result = _context19.sent;
               this._loadCurrentOrgPromise = null;
-              return _context15.abrupt("return", result);
-            case 14:
-              _context15.prev = 14;
-              _context15.t0 = _context15["catch"](1);
+              return _context19.abrupt("return", result);
+            case 12:
+              _context19.prev = 12;
+              _context19.t0 = _context19["catch"](1);
               this._loadCurrentOrgPromise = null;
-              return _context15.abrupt("return", this._handleError(_context15.t0));
-            case 18:
+              return _context19.abrupt("return", this._handleError(_context19.t0));
+            case 16:
             case "end":
-              return _context15.stop();
+              return _context19.stop();
           }
-        }, _callee15, this, [[1, 14]]);
+        }, _callee19, this, [[1, 12]]);
       }));
       function loadCurrentOrganization() {
         return _loadCurrentOrganization.apply(this, arguments);
@@ -970,24 +1167,24 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "switchOrganization",
     value: (function () {
-      var _switchOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(orgId) {
+      var _switchOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(orgId) {
         var org, userObj;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _context16.prev = 0;
+              _context20.prev = 0;
               if (this.currentUser) {
-                _context16.next = 3;
+                _context20.next = 3;
                 break;
               }
               throw new Error('Must be logged in to switch organization');
             case 3:
-              _context16.next = 5;
-              return this.get('<@iac.organization>', orgId);
+              _context20.next = 5;
+              return this.load('<@iac.organization>', orgId);
             case 5:
-              org = _context16.sent;
+              org = _context20.sent;
               if (org) {
-                _context16.next = 8;
+                _context20.next = 8;
                 break;
               }
               throw new Error("Organization ".concat(orgId, " not found or not accessible"));
@@ -995,55 +1192,59 @@ var RbtApi = /*#__PURE__*/function () {
               this.currentOrganization = org;
 
               // Save preference to user
-              _context16.prev = 9;
-              _context16.next = 12;
+              _context20.prev = 9;
+              _context20.next = 12;
               return this.loadUser(this.currentUser.id);
             case 12:
-              userObj = _context16.sent;
-              userObj.set('mod.currentOrgId', orgId);
-              _context16.next = 16;
+              userObj = _context20.sent;
+              persistUserCurrentOrgPreference(userObj, orgId);
+              _context20.next = 16;
               return userObj.save();
             case 16:
               if (!this.localStorageAdaptor) {
-                _context16.next = 19;
+                _context20.next = 19;
                 break;
               }
-              _context16.next = 19;
+              _context20.next = 19;
               return this.localStorageAdaptor.setItem('currentOrgId', orgId);
             case 19:
-              _context16.next = 23;
+              _context20.next = 23;
               break;
             case 21:
-              _context16.prev = 21;
-              _context16.t0 = _context16["catch"](9);
+              _context20.prev = 21;
+              _context20.t0 = _context20["catch"](9);
             case 23:
-              return _context16.abrupt("return", org);
+              return _context20.abrupt("return", org);
             case 26:
-              _context16.prev = 26;
-              _context16.t1 = _context16["catch"](0);
-              return _context16.abrupt("return", this._handleError(_context16.t1));
+              _context20.prev = 26;
+              _context20.t1 = _context20["catch"](0);
+              return _context20.abrupt("return", this._handleError(_context20.t1));
             case 29:
             case "end":
-              return _context16.stop();
+              return _context20.stop();
           }
-        }, _callee16, this, [[0, 26], [9, 21]]);
+        }, _callee20, this, [[0, 26], [9, 21]]);
       }));
-      function switchOrganization(_x7) {
+      function switchOrganization(_x11) {
         return _switchOrganization.apply(this, arguments);
       }
       return switchOrganization;
     }()
     /**
-     * Get current organization (null-safe)
-     * Returns cached organization without triggering a load
-     * 
-     * @returns {RbtObject|null} Current organization or null
+     * Get cached current organization (sync, null-safe).
+     * Returns **null** unless `mod.iac.currentOrgId` (or legacy `mod.currentOrgId`) matches `currentOrganization`.
      */
     )
   }, {
     key: "getCurrentOrganization",
     value: function getCurrentOrganization() {
-      return this.currentOrganization;
+      var org = this.currentOrganization;
+      if (!org) return null;
+      var user = this.currentUser;
+      var selected = readUserCurrentOrgPreference(user);
+      if (!selected) return null;
+      if (String(org.id) !== selected) return null;
+      return org;
     }
 
     /**
@@ -1058,48 +1259,47 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "selectCurrentOrganization",
     value: (function () {
-      var _selectCurrentOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orgId) {
+      var _selectCurrentOrganization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(orgId) {
         var role,
           org,
           user,
           userOrgs,
           orgExists,
-          modData,
-          _args17 = arguments;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+          _args21 = arguments;
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              role = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : 'owner';
-              _context17.prev = 1;
+              role = _args21.length > 1 && _args21[1] !== undefined ? _args21[1] : 'owner';
+              _context21.prev = 1;
               if (this.currentUser) {
-                _context17.next = 7;
+                _context21.next = 7;
                 break;
               }
-              _context17.next = 5;
+              _context21.next = 5;
               return this.loadCurrentUser();
             case 5:
               if (this.currentUser) {
-                _context17.next = 7;
+                _context21.next = 7;
                 break;
               }
               throw new Error('Must be logged in to select organization');
             case 7:
-              _context17.next = 9;
-              return this.get('<@iac.organization>', orgId);
+              _context21.next = 9;
+              return this.load('<@iac.organization>', orgId);
             case 9:
-              org = _context17.sent;
+              org = _context21.sent;
               if (org) {
-                _context17.next = 12;
+                _context21.next = 12;
                 break;
               }
               throw new Error("Organization ".concat(orgId, " not found or not accessible"));
             case 12:
-              _context17.next = 14;
+              _context21.next = 14;
               return this.loadUser(this.currentUser.id);
             case 14:
-              user = _context17.sent;
+              user = _context21.sent;
               if (user) {
-                _context17.next = 17;
+                _context21.next = 17;
                 break;
               }
               throw new Error('Failed to load user object');
@@ -1121,16 +1321,14 @@ var RbtApi = /*#__PURE__*/function () {
                 //console.log('[RbtApi] Organization already in user organizations array');
               }
 
-              // Set as current organization preference - handle both nested path formats
-              modData = user.get('mod') || {};
-              modData.currentOrgId = orgId;
-              user.set('mod', modData);
+              // Set current organization preference under mod.iac (module-namespaced settings)
+              persistUserCurrentOrgPreference(user, orgId);
 
               // Save user record
               //console.log('[RbtApi] Saving user with organization:', orgId);
-              _context17.next = 25;
+              _context21.next = 23;
               return user.save();
-            case 25:
+            case 23:
               //console.log('[RbtApi] User saved successfully');
 
               // Clear cached organization to force reload
@@ -1144,25 +1342,25 @@ var RbtApi = /*#__PURE__*/function () {
 
               // Update cache
               if (!this.localStorageAdaptor) {
-                _context17.next = 31;
+                _context21.next = 29;
                 break;
               }
-              _context17.next = 31;
+              _context21.next = 29;
               return this.localStorageAdaptor.setItem('currentOrgId', orgId);
-            case 31:
-              return _context17.abrupt("return", org);
-            case 34:
-              _context17.prev = 34;
-              _context17.t0 = _context17["catch"](1);
-              console.error('[RbtApi] Error in selectCurrentOrganization:', _context17.t0);
-              return _context17.abrupt("return", this._handleError(_context17.t0));
-            case 38:
+            case 29:
+              return _context21.abrupt("return", org);
+            case 32:
+              _context21.prev = 32;
+              _context21.t0 = _context21["catch"](1);
+              console.error('[RbtApi] Error in selectCurrentOrganization:', _context21.t0);
+              return _context21.abrupt("return", this._handleError(_context21.t0));
+            case 36:
             case "end":
-              return _context17.stop();
+              return _context21.stop();
           }
-        }, _callee17, this, [[1, 34]]);
+        }, _callee21, this, [[1, 32]]);
       }));
-      function selectCurrentOrganization(_x8) {
+      function selectCurrentOrganization(_x12) {
         return _selectCurrentOrganization.apply(this, arguments);
       }
       return selectCurrentOrganization;
@@ -1170,11 +1368,11 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "loadUser",
     value: function () {
-      var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(userId) {
+      var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(userId) {
         var _this5 = this;
         var params, cacheKey, now, existing, p;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               params = {
                 id: userId
@@ -1183,53 +1381,53 @@ var RbtApi = /*#__PURE__*/function () {
               now = Date.now();
               existing = this.requestCache[cacheKey];
               if (!(existing && now - existing.time < 10000)) {
-                _context19.next = 6;
+                _context23.next = 6;
                 break;
               }
-              return _context19.abrupt("return", existing.val);
+              return _context23.abrupt("return", existing.val);
             case 6:
-              _context19.prev = 6;
-              p = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-                var _response$data;
+              _context23.prev = 6;
+              p = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+                var _response$data2;
                 var response, userData, User;
-                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-                  while (1) switch (_context18.prev = _context18.next) {
+                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+                  while (1) switch (_context22.prev = _context22.next) {
                     case 0:
-                      _context18.next = 2;
+                      _context22.next = 2;
                       return _this5.axios.post('/api/iac/loadUser', [params]);
                     case 2:
-                      response = _context18.sent;
-                      userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
+                      response = _context22.sent;
+                      userData = response === null || response === void 0 || (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.user;
                       User = new RbtUser({
                         id: userData.id
                       }, _this5.axios);
                       User.setData(userData);
-                      return _context18.abrupt("return", User);
+                      return _context22.abrupt("return", User);
                     case 7:
                     case "end":
-                      return _context18.stop();
+                      return _context22.stop();
                   }
-                }, _callee18);
+                }, _callee22);
               }))();
               this.requestCache[cacheKey] = {
                 val: p,
                 time: now
               };
-              _context19.next = 11;
+              _context23.next = 11;
               return p;
             case 11:
-              return _context19.abrupt("return", _context19.sent);
+              return _context23.abrupt("return", _context23.sent);
             case 14:
-              _context19.prev = 14;
-              _context19.t0 = _context19["catch"](6);
-              return _context19.abrupt("return", this._handleError(_context19.t0));
+              _context23.prev = 14;
+              _context23.t0 = _context23["catch"](6);
+              return _context23.abrupt("return", this._handleError(_context23.t0));
             case 17:
             case "end":
-              return _context19.stop();
+              return _context23.stop();
           }
-        }, _callee19, this, [[6, 14]]);
+        }, _callee23, this, [[6, 14]]);
       }));
-      function loadUser(_x9) {
+      function loadUser(_x13) {
         return _loadUser.apply(this, arguments);
       }
       return loadUser;
@@ -1237,53 +1435,53 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "refreshAuthToken",
     value: function () {
-      var _refreshAuthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(authtoken) {
+      var _refreshAuthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(authtoken) {
         var promise, response;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               if (this.appServiceHost) {
-                _context20.next = 2;
+                _context24.next = 2;
                 break;
               }
-              return _context20.abrupt("return", false);
+              return _context24.abrupt("return", false);
             case 2:
               if (!this.requestCache[authtoken]) {
-                _context20.next = 4;
+                _context24.next = 4;
                 break;
               }
-              return _context20.abrupt("return", this.requestCache[authtoken]);
+              return _context24.abrupt("return", this.requestCache[authtoken]);
             case 4:
-              _context20.prev = 4;
+              _context24.prev = 4;
               //console.log('RBTTOK Req', authtoken);
               // Create a new promise for the token refresh and store it in the cache
               promise = this.axios.post('/api/iac/refreshAuthToken', [authtoken]);
               this.requestCache[authtoken] = promise;
 
               // Await the promise to get the response
-              _context20.next = 9;
+              _context24.next = 9;
               return promise;
             case 9:
-              response = _context20.sent;
+              response = _context24.sent;
               //console.log('RBTTOK Response ',response);
               // Once the promise resolves, delete it from the cache to allow future refreshes
               delete this.requestCache[authtoken];
 
               // Return the response data
-              return _context20.abrupt("return", response.data);
+              return _context24.abrupt("return", response.data);
             case 14:
-              _context20.prev = 14;
-              _context20.t0 = _context20["catch"](4);
+              _context24.prev = 14;
+              _context24.t0 = _context24["catch"](4);
               // On error, remove the cached promise to allow retries
               delete this.requestCache[authtoken];
-              this._handleError(_context20.t0);
+              this._handleError(_context24.t0);
             case 18:
             case "end":
-              return _context20.stop();
+              return _context24.stop();
           }
-        }, _callee20, this, [[4, 14]]);
+        }, _callee24, this, [[4, 14]]);
       }));
-      function refreshAuthToken(_x10) {
+      function refreshAuthToken(_x14) {
         return _refreshAuthToken.apply(this, arguments);
       }
       return refreshAuthToken;
@@ -1314,31 +1512,31 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "registerUser",
     value: function () {
-      var _registerUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var _registerUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var dataHash,
           response,
           record,
-          _args21 = arguments;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+          _args25 = arguments;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              dataHash = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
-              _context21.prev = 1;
-              _context21.next = 4;
+              dataHash = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {};
+              _context25.prev = 1;
+              _context25.next = 4;
               return this.axios.post('/api/iac/registerUser', [dataHash]);
             case 4:
-              response = _context21.sent;
+              response = _context25.sent;
               record = response.data;
-              return _context21.abrupt("return", new RbtUser(record, this.axios));
+              return _context25.abrupt("return", new RbtUser(record, this.axios));
             case 9:
-              _context21.prev = 9;
-              _context21.t0 = _context21["catch"](1);
-              return _context21.abrupt("return", this._handleError(_context21.t0));
+              _context25.prev = 9;
+              _context25.t0 = _context25["catch"](1);
+              return _context25.abrupt("return", this._handleError(_context25.t0));
             case 12:
             case "end":
-              return _context21.stop();
+              return _context25.stop();
           }
-        }, _callee21, this, [[1, 9]]);
+        }, _callee25, this, [[1, 9]]);
       }));
       function registerUser() {
         return _registerUser.apply(this, arguments);
@@ -1355,32 +1553,32 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "createFile",
     value: (function () {
-      var _createFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(dataHash) {
+      var _createFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(dataHash) {
         var response, record;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context22.prev = 0;
-              _context22.next = 3;
+              _context26.prev = 0;
+              _context26.next = 3;
               return this.axios.post('/object_service/createObject', ['<@filekit.file>', dataHash]);
             case 3:
-              response = _context22.sent;
+              response = _context26.sent;
               record = response.data;
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context22.abrupt("return", new RbtFile(record, this.axios, this.localDb));
+              return _context26.abrupt("return", new RbtFile(record, this.axios, this.localDb));
             case 9:
-              _context22.prev = 9;
-              _context22.t0 = _context22["catch"](0);
-              return _context22.abrupt("return", this._handleError(_context22.t0));
+              _context26.prev = 9;
+              _context26.t0 = _context26["catch"](0);
+              return _context26.abrupt("return", this._handleError(_context26.t0));
             case 12:
             case "end":
-              return _context22.stop();
+              return _context26.stop();
           }
-        }, _callee22, this, [[0, 9]]);
+        }, _callee26, this, [[0, 9]]);
       }));
-      function createFile(_x11) {
+      function createFile(_x15) {
         return _createFile.apply(this, arguments);
       }
       return createFile;
@@ -1388,35 +1586,35 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "loadFile",
     value: function () {
-      var _loadFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(id) {
+      var _loadFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(id) {
         var response, record;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context23.prev = 0;
-              _context23.next = 3;
+              _context27.prev = 0;
+              _context27.next = 3;
               return this.load('<@filekit.file>', id);
             case 3:
-              response = _context23.sent;
+              response = _context27.sent;
               if (response) {
-                _context23.next = 6;
+                _context27.next = 6;
                 break;
               }
-              return _context23.abrupt("return", null);
+              return _context27.abrupt("return", null);
             case 6:
               record = response.toRecord();
-              return _context23.abrupt("return", new RbtFile(record, this.axios, this.localDb));
+              return _context27.abrupt("return", new RbtFile(record, this.axios, this.localDb));
             case 10:
-              _context23.prev = 10;
-              _context23.t0 = _context23["catch"](0);
-              return _context23.abrupt("return", this._handleError(_context23.t0));
+              _context27.prev = 10;
+              _context27.t0 = _context27["catch"](0);
+              return _context27.abrupt("return", this._handleError(_context27.t0));
             case 13:
             case "end":
-              return _context23.stop();
+              return _context27.stop();
           }
-        }, _callee23, this, [[0, 10]]);
+        }, _callee27, this, [[0, 10]]);
       }));
-      function loadFile(_x12) {
+      function loadFile(_x16) {
         return _loadFile.apply(this, arguments);
       }
       return loadFile;
@@ -1424,39 +1622,39 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "loadFiles",
     value: function () {
-      var _loadFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(ids) {
+      var _loadFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(ids) {
         var _this6 = this;
         var responses;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context24.prev = 0;
-              _context24.next = 3;
+              _context28.prev = 0;
+              _context28.next = 3;
               return this.load('<@filekit.file>', ids);
             case 3:
-              responses = _context24.sent;
+              responses = _context28.sent;
               if (!(!responses || !Array.isArray(responses))) {
-                _context24.next = 6;
+                _context28.next = 6;
                 break;
               }
-              return _context24.abrupt("return", []);
+              return _context28.abrupt("return", []);
             case 6:
-              return _context24.abrupt("return", responses.map(function (response) {
+              return _context28.abrupt("return", responses.map(function (response) {
                 var record = response.toRecord();
                 return new RbtFile(record, _this6.axios, _this6.localDb);
               }));
             case 9:
-              _context24.prev = 9;
-              _context24.t0 = _context24["catch"](0);
-              this._handleError(_context24.t0); // Handle errors (log or process as needed)
-              return _context24.abrupt("return", []);
+              _context28.prev = 9;
+              _context28.t0 = _context28["catch"](0);
+              this._handleError(_context28.t0); // Handle errors (log or process as needed)
+              return _context28.abrupt("return", []);
             case 13:
             case "end":
-              return _context24.stop();
+              return _context28.stop();
           }
-        }, _callee24, this, [[0, 9]]);
+        }, _callee28, this, [[0, 9]]);
       }));
-      function loadFiles(_x13) {
+      function loadFiles(_x17) {
         return _loadFiles.apply(this, arguments);
       }
       return loadFiles;
@@ -1472,42 +1670,42 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "create",
     value: (function () {
-      var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(type) {
+      var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(type) {
         var dataHash,
           options,
           response,
           record,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              dataHash = _args25.length > 1 && _args25[1] !== undefined ? _args25[1] : {};
-              options = _args25.length > 2 && _args25[2] !== undefined ? _args25[2] : {};
-              _context25.prev = 2;
-              _context25.next = 5;
+              dataHash = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
+              options = _args29.length > 2 && _args29[2] !== undefined ? _args29[2] : {};
+              _context29.prev = 2;
+              _context29.next = 5;
               return this.axios.post('/object_service/createObject', [type, dataHash]);
             case 5:
-              response = _context25.sent;
+              response = _context29.sent;
               record = response.data;
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context25.abrupt("return", new RbtObject(record, this.axios, {
+              return _context29.abrupt("return", new RbtObject(record, this.axios, {
                 isNew: true,
                 websocketClient: this.websocketClient,
                 enableRealtime: options.enableRealtime || false
               }));
             case 11:
-              _context25.prev = 11;
-              _context25.t0 = _context25["catch"](2);
-              return _context25.abrupt("return", this._handleError(_context25.t0));
+              _context29.prev = 11;
+              _context29.t0 = _context29["catch"](2);
+              return _context29.abrupt("return", this._handleError(_context29.t0));
             case 14:
             case "end":
-              return _context25.stop();
+              return _context29.stop();
           }
-        }, _callee25, this, [[2, 11]]);
+        }, _callee29, this, [[2, 11]]);
       }));
-      function create(_x14) {
+      function create(_x18) {
         return _create.apply(this, arguments);
       }
       return create;
@@ -1532,6 +1730,7 @@ var RbtApi = /*#__PURE__*/function () {
      * - excludeAttrs: An array of attribute paths to exclude from the response (e.g., ['details.log', 'internalData']).
      *                 Excludes the specified paths and all their subpaths.
      * - resolveReferences: An array of attribute names whose references should be resolved in the returned objects.
+     * - resolveAttrs: Attribute paths whose mod / reference values should be resolved (e.g., ['configs.mod.guide.completion']).
      * - timeout: A numerical value in milliseconds to set a maximum time limit for the query execution.
      * - cache: Boolean. When true, enables a 10-second response cache for identical queries. Default: false (no caching).
      *
@@ -1543,6 +1742,7 @@ var RbtApi = /*#__PURE__*/function () {
      *     requestAttrs: ['id', 'configs.title'],
      *     excludeAttrs: ['details.log'],
      *     resolveReferences: ['translatableContent'],
+     *     resolveAttrs: ['configs.mod.guide.completion'],
      *     cache: true  // opt-in to 10s response caching
      *   });
      *
@@ -1552,7 +1752,7 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "query",
     value: (function () {
-      var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(type) {
+      var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(type) {
         var _this7 = this;
         var params,
           paramsKey,
@@ -1566,20 +1766,20 @@ var RbtApi = /*#__PURE__*/function () {
           cacheEntry,
           responsePromise,
           processingPromise,
-          _args26 = arguments;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+          _args30 = arguments;
+        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
-              params = _args26.length > 1 && _args26[1] !== undefined ? _args26[1] : {};
-              _context26.prev = 1;
+              params = _args30.length > 1 && _args30[1] !== undefined ? _args30[1] : {};
+              _context30.prev = 1;
               //console.log('RBTAPI.query INIT', type, params);
               // Validate parameters - reject invalid parameter names
-              validParams = ['type', 'where', 'orderBy', 'limit', 'resolveReferences', 'requestAttrs', 'excludeAttrs', 'timeout', 'enableRealtime', 'cache'];
+              validParams = ['type', 'where', 'orderBy', 'limit', 'resolveReferences', 'resolveAttrs', 'requestAttrs', 'excludeAttrs', 'timeout', 'enableRealtime', 'cache'];
               invalidParams = Object.keys(params).filter(function (key) {
                 return !validParams.includes(key);
               });
               if (!(invalidParams.length > 0)) {
-                _context26.next = 6;
+                _context30.next = 6;
                 break;
               }
               throw new Error("Invalid query parameter(s): ".concat(invalidParams.join(', '), ". Valid parameters are: ").concat(validParams.join(', ')));
@@ -1607,15 +1807,15 @@ var RbtApi = /*#__PURE__*/function () {
               currentTime = Date.now();
               paramsKey = JSON.stringify(mergedParams);
               if (!useCache) {
-                _context26.next = 19;
+                _context30.next = 19;
                 break;
               }
               cacheEntry = this.requestCache[paramsKey];
               if (!(cacheEntry && currentTime - cacheEntry.time < 10000)) {
-                _context26.next = 19;
+                _context30.next = 19;
                 break;
               }
-              return _context26.abrupt("return", cacheEntry.val);
+              return _context30.abrupt("return", cacheEntry.val);
             case 19:
               // Create the response promise
               responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]); // Cache the promise of processing data, not just the raw response
@@ -1633,23 +1833,23 @@ var RbtApi = /*#__PURE__*/function () {
               }
 
               // Await the processing promise for this call to get processed data
-              _context26.next = 24;
+              _context30.next = 24;
               return processingPromise;
             case 24:
-              return _context26.abrupt("return", _context26.sent);
+              return _context30.abrupt("return", _context30.sent);
             case 27:
-              _context26.prev = 27;
-              _context26.t0 = _context26["catch"](1);
+              _context30.prev = 27;
+              _context30.t0 = _context30["catch"](1);
               delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
               //console.log('RBTAPI.query ERROR', paramsKey, e);
-              return _context26.abrupt("return", this._handleError(_context26.t0));
+              return _context30.abrupt("return", this._handleError(_context30.t0));
             case 31:
             case "end":
-              return _context26.stop();
+              return _context30.stop();
           }
-        }, _callee26, this, [[1, 27]]);
+        }, _callee30, this, [[1, 27]]);
       }));
-      function query(_x15) {
+      function query(_x19) {
         return _query.apply(this, arguments);
       }
       return query;
@@ -1693,7 +1893,7 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "load",
     value: (function () {
-      var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(type, ids) {
+      var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(type, ids) {
         var _this9 = this;
         var params,
           mergedParams,
@@ -1726,17 +1926,17 @@ var RbtApi = /*#__PURE__*/function () {
           pendingKey,
           missLogKey,
           loadPromise,
-          _args28 = arguments;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+          _args32 = arguments;
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              params = _args28.length > 2 && _args28[2] !== undefined ? _args28[2] : {};
+              params = _args32.length > 2 && _args32[2] !== undefined ? _args32[2] : {};
               if (type == '<@iac.user>') {
                 debugger;
               }
-              _context28.prev = 2;
+              _context32.prev = 2;
               if (!Array.isArray(ids)) {
-                _context28.next = 25;
+                _context32.next = 25;
                 break;
               }
               // For array requests, check cache for each ID and only load missing ones
@@ -1775,7 +1975,7 @@ var RbtApi = /*#__PURE__*/function () {
               }
               loadedObjects = [];
               if (!(missingIds.length > 0)) {
-                _context28.next = 19;
+                _context32.next = 19;
                 break;
               }
               // Only log bulk cache miss once
@@ -1790,10 +1990,10 @@ var RbtApi = /*#__PURE__*/function () {
               mergedParams = _objectSpread(_objectSpread({}, queryParams), {}, {
                 where: "id IN (\"".concat(missingIds.join("\",\""), "\")")
               });
-              _context28.next = 16;
+              _context32.next = 16;
               return this.query(type, mergedParams);
             case 16:
-              loadedObjects = _context28.sent;
+              loadedObjects = _context32.sent;
               // Cache the newly loaded objects
               _iterator4 = _createForOfIteratorHelper(loadedObjects);
               try {
@@ -1836,13 +2036,13 @@ var RbtApi = /*#__PURE__*/function () {
               } finally {
                 _iterator5.f();
               }
-              return _context28.abrupt("return", result);
+              return _context32.abrupt("return", result);
             case 25:
               // For single object requests, check cache first
               _cacheKey3 = "".concat(type, ":").concat(ids);
               _cached = this._objectCache.get(_cacheKey3);
               if (!_cached) {
-                _context28.next = 32;
+                _context32.next = 32;
                 break;
               }
               // Only log cache hits once per object to reduce spam
@@ -1856,18 +2056,18 @@ var RbtApi = /*#__PURE__*/function () {
                 //console.log('[AgentProviderSync] 🔄 Upgrading cached object to realtime:', { type, id: ids });
                 _cached._initRealtime();
               }
-              return _context28.abrupt("return", _cached);
+              return _context32.abrupt("return", _cached);
             case 32:
               // Check if we're already loading this object
               pendingKey = "".concat(type, ":").concat(ids);
               if (!this._pendingLoads.has(pendingKey)) {
-                _context28.next = 37;
+                _context32.next = 37;
                 break;
               }
-              _context28.next = 36;
+              _context32.next = 36;
               return this._pendingLoads.get(pendingKey);
             case 36:
-              return _context28.abrupt("return", _context28.sent);
+              return _context32.abrupt("return", _context32.sent);
             case 37:
               // Only log cache miss once per object to reduce spam
               missLogKey = "miss:".concat(_cacheKey3);
@@ -1877,21 +2077,21 @@ var RbtApi = /*#__PURE__*/function () {
               }
 
               // Create the loading promise and store it to prevent duplicate requests
-              loadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
+              loadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
                 var _enableRealtime, _queryParams, res, _obj2, _setLogKey;
-                return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-                  while (1) switch (_context27.prev = _context27.next) {
+                return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+                  while (1) switch (_context31.prev = _context31.next) {
                     case 0:
-                      _context27.prev = 0;
+                      _context31.prev = 0;
                       // Remove load-specific params that shouldn't be passed to query
                       _enableRealtime = params.enableRealtime, _queryParams = _objectWithoutProperties(params, _excluded2);
                       mergedParams = _objectSpread(_objectSpread({}, _queryParams), {}, {
                         where: "id=\"".concat(ids, "\"")
                       });
-                      _context27.next = 5;
+                      _context31.next = 5;
                       return _this9.query(type, mergedParams);
                     case 5:
-                      res = _context27.sent;
+                      res = _context31.sent;
                       _obj2 = res[0];
                       if (_obj2) {
                         // Cache the loaded object
@@ -1904,37 +2104,37 @@ var RbtApi = /*#__PURE__*/function () {
                           _this9._loggedCacheEvents.add(_setLogKey);
                         }
                       }
-                      return _context27.abrupt("return", _obj2);
+                      return _context31.abrupt("return", _obj2);
                     case 9:
-                      _context27.prev = 9;
+                      _context31.prev = 9;
                       // Remove from pending loads
                       _this9._pendingLoads["delete"](pendingKey);
-                      return _context27.finish(9);
+                      return _context31.finish(9);
                     case 12:
                     case "end":
-                      return _context27.stop();
+                      return _context31.stop();
                   }
-                }, _callee27, null, [[0,, 9, 12]]);
+                }, _callee31, null, [[0,, 9, 12]]);
               }))(); // Store the promise so other concurrent requests can await it
               this._pendingLoads.set(pendingKey, loadPromise);
-              _context28.next = 43;
+              _context32.next = 43;
               return loadPromise;
             case 43:
-              return _context28.abrupt("return", _context28.sent);
+              return _context32.abrupt("return", _context32.sent);
             case 44:
-              _context28.next = 49;
+              _context32.next = 49;
               break;
             case 46:
-              _context28.prev = 46;
-              _context28.t0 = _context28["catch"](2);
-              return _context28.abrupt("return", this._handleError(_context28.t0));
+              _context32.prev = 46;
+              _context32.t0 = _context32["catch"](2);
+              return _context32.abrupt("return", this._handleError(_context32.t0));
             case 49:
             case "end":
-              return _context28.stop();
+              return _context32.stop();
           }
-        }, _callee28, this, [[2, 46]]);
+        }, _callee32, this, [[2, 46]]);
       }));
-      function load(_x16, _x17) {
+      function load(_x20, _x21) {
         return _load.apply(this, arguments);
       }
       return load;
@@ -2015,11 +2215,11 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "getCacheStatus",
     value: function getCacheStatus() {
-      var cacheEntries = Array.from(this._objectCache.entries()).map(function (_ref7) {
+      var cacheEntries = Array.from(this._objectCache.entries()).map(function (_ref8) {
         var _obj$_internalData;
-        var _ref8 = _slicedToArray(_ref7, 2),
-          key = _ref8[0],
-          obj = _ref8[1];
+        var _ref9 = _slicedToArray(_ref8, 2),
+          key = _ref9[0],
+          obj = _ref9[1];
         return {
           key: key,
           id: obj.id,
@@ -2057,7 +2257,7 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "runTask",
     value: (function () {
-      var _runTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _runTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
         var params,
           callbacks,
           onProgress,
@@ -2072,20 +2272,20 @@ var RbtApi = /*#__PURE__*/function () {
           message,
           output,
           errorResponse,
-          _args29 = arguments;
-        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+          _args33 = arguments;
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              params = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
-              callbacks = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
+              params = _args33.length > 0 && _args33[0] !== undefined ? _args33[0] : {};
+              callbacks = _args33.length > 1 && _args33[1] !== undefined ? _args33[1] : {};
               onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onWaiting = callbacks.onWaiting, onDone = callbacks.onDone;
-              _context29.prev = 3;
-              _context29.next = 6;
+              _context33.prev = 3;
+              _context33.next = 6;
               return this.post('/task_service/runChain', params);
             case 6:
-              response = _context29.sent;
+              response = _context33.sent;
               if (response) {
-                _context29.next = 9;
+                _context33.next = 9;
                 break;
               }
               throw new Error('Invalid server response');
@@ -2093,7 +2293,7 @@ var RbtApi = /*#__PURE__*/function () {
               // Validate response structure
               ok = response.ok, jobId = response.jobId, status = response.status, message = response.message, output = response.output;
               if (!(!ok || typeof jobId !== 'string' || typeof status !== 'string')) {
-                _context29.next = 12;
+                _context33.next = 12;
                 break;
               }
               throw new Error('Invalid response structure');
@@ -2119,7 +2319,7 @@ var RbtApi = /*#__PURE__*/function () {
                 //console.log('Finish (request) ',response);  s
                 onDone(response);
               }
-              return _context29.abrupt("return", {
+              return _context33.abrupt("return", {
                 ok: ok,
                 jobId: jobId,
                 status: status,
@@ -2127,21 +2327,21 @@ var RbtApi = /*#__PURE__*/function () {
                 output: output
               });
             case 20:
-              _context29.prev = 20;
-              _context29.t0 = _context29["catch"](3);
+              _context33.prev = 20;
+              _context33.t0 = _context33["catch"](3);
               // Standardize error format to match task response object
               // Support RbtError format with label and message
               errorResponse = {
                 ok: false,
                 jobId: null,
                 status: 'ERROR',
-                message: _context29.t0.message || _context29.t0.toString() || 'Unknown error',
-                label: _context29.t0.label || _context29.t0.name || 'Error',
+                message: _context33.t0.message || _context33.t0.toString() || 'Unknown error',
+                label: _context33.t0.label || _context33.t0.name || 'Error',
                 output: {
-                  error: _context29.t0.message,
-                  label: _context29.t0.label,
-                  stack: _context29.t0.stack,
-                  originalError: _context29.t0
+                  error: _context33.t0.message,
+                  label: _context33.t0.label,
+                  stack: _context33.t0.stack,
+                  originalError: _context33.t0
                 }
               };
               if (typeof onError === 'function') {
@@ -2149,12 +2349,12 @@ var RbtApi = /*#__PURE__*/function () {
               } else {
                 console.error('Error in runTask:', errorResponse.message);
               }
-              return _context29.abrupt("return", errorResponse);
+              return _context33.abrupt("return", errorResponse);
             case 25:
             case "end":
-              return _context29.stop();
+              return _context33.stop();
           }
-        }, _callee29, this, [[3, 20]]);
+        }, _callee33, this, [[3, 20]]);
       }));
       function runTask() {
         return _runTask.apply(this, arguments);
@@ -2164,37 +2364,37 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "stopJob",
     value: function () {
-      var _stopJob = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
+      var _stopJob = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var params,
           callbacks,
           response,
-          _args30 = arguments;
-        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+          _args34 = arguments;
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              params = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {};
-              callbacks = _args30.length > 1 && _args30[1] !== undefined ? _args30[1] : {};
-              _context30.prev = 2;
-              _context30.next = 5;
+              params = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : {};
+              callbacks = _args34.length > 1 && _args34[1] !== undefined ? _args34[1] : {};
+              _context34.prev = 2;
+              _context34.next = 5;
               return this.post('/task_service/stopJob', params);
             case 5:
-              response = _context30.sent;
+              response = _context34.sent;
               if (response) {
-                _context30.next = 8;
+                _context34.next = 8;
                 break;
               }
               throw new Error('Invalid server response');
             case 8:
-              return _context30.abrupt("return", true);
+              return _context34.abrupt("return", true);
             case 11:
-              _context30.prev = 11;
-              _context30.t0 = _context30["catch"](2);
+              _context34.prev = 11;
+              _context34.t0 = _context34["catch"](2);
               throw 'Error in stopJob';
             case 14:
             case "end":
-              return _context30.stop();
+              return _context34.stop();
           }
-        }, _callee30, this, [[2, 11]]);
+        }, _callee34, this, [[2, 11]]);
       }));
       function stopJob() {
         return _stopJob.apply(this, arguments);
@@ -2242,26 +2442,26 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "pollTaskProgress",
     value: (function () {
-      var _pollTaskProgress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(jobId, callbacks) {
+      var _pollTaskProgress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(jobId, callbacks) {
         var _this10 = this;
         var onProgress, onError, onStopped, onWaiting, onDone, _callbacks$pollingInt, pollingInterval, checkProgress;
-        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onWaiting = callbacks.onWaiting, onDone = callbacks.onDone, _callbacks$pollingInt = callbacks.pollingInterval, pollingInterval = _callbacks$pollingInt === void 0 ? 2000 : _callbacks$pollingInt;
-              _context32.prev = 1;
+              _context36.prev = 1;
               checkProgress = /*#__PURE__*/function () {
-                var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
+                var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
                   var response;
-                  return _regeneratorRuntime().wrap(function _callee31$(_context31) {
-                    while (1) switch (_context31.prev = _context31.next) {
+                  return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+                    while (1) switch (_context35.prev = _context35.next) {
                       case 0:
-                        _context31.next = 2;
+                        _context35.next = 2;
                         return _this10.get("/task_service/pollChainProgress", {
                           jobId: jobId
                         });
                       case 2:
-                        response = _context31.sent;
+                        response = _context35.sent;
                         // If the task is still in progress, start polling for updates
                         if (response.status === 'DONE' && onDone) {
                           // Provide the current progress to the callback function
@@ -2292,28 +2492,28 @@ var RbtApi = /*#__PURE__*/function () {
                         }
                       case 9:
                       case "end":
-                        return _context31.stop();
+                        return _context35.stop();
                     }
-                  }, _callee31);
+                  }, _callee35);
                 }));
                 return function checkProgress() {
-                  return _ref9.apply(this, arguments);
+                  return _ref10.apply(this, arguments);
                 };
               }();
               checkProgress();
-              _context32.next = 9;
+              _context36.next = 9;
               break;
             case 6:
-              _context32.prev = 6;
-              _context32.t0 = _context32["catch"](1);
-              return _context32.abrupt("return", this._handleError(_context32.t0));
+              _context36.prev = 6;
+              _context36.t0 = _context36["catch"](1);
+              return _context36.abrupt("return", this._handleError(_context36.t0));
             case 9:
             case "end":
-              return _context32.stop();
+              return _context36.stop();
           }
-        }, _callee32, this, [[1, 6]]);
+        }, _callee36, this, [[1, 6]]);
       }));
-      function pollTaskProgress(_x18, _x19) {
+      function pollTaskProgress(_x22, _x23) {
         return _pollTaskProgress.apply(this, arguments);
       }
       return pollTaskProgress;
@@ -2334,18 +2534,18 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: (function () {
-      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(endpoint) {
+      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(endpoint) {
         var params,
           customHeaders,
           config,
           response,
-          _args33 = arguments;
-        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+          _args37 = arguments;
+        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              params = _args33.length > 1 && _args33[1] !== undefined ? _args33[1] : {};
-              customHeaders = _args33.length > 2 && _args33[2] !== undefined ? _args33[2] : null;
-              _context33.prev = 2;
+              params = _args37.length > 1 && _args37[1] !== undefined ? _args37[1] : {};
+              customHeaders = _args37.length > 2 && _args37[2] !== undefined ? _args37[2] : null;
+              _context37.prev = 2;
               // Build request config
               config = {
                 params: params
@@ -2360,28 +2560,28 @@ var RbtApi = /*#__PURE__*/function () {
               // Otherwise, don't set config.headers at all - let axios use its defaults
 
               // Make the GET request using Axios
-              _context33.next = 7;
+              _context37.next = 7;
               return this.axios.get(endpoint, config);
             case 7:
-              response = _context33.sent;
+              response = _context37.sent;
               if (!(response.data.ok === false)) {
-                _context33.next = 10;
+                _context37.next = 10;
                 break;
               }
-              return _context33.abrupt("return", this._handleError(response));
+              return _context37.abrupt("return", this._handleError(response));
             case 10:
-              return _context33.abrupt("return", response.data);
+              return _context37.abrupt("return", response.data);
             case 13:
-              _context33.prev = 13;
-              _context33.t0 = _context33["catch"](2);
-              return _context33.abrupt("return", this._handleError(_context33.t0));
+              _context37.prev = 13;
+              _context37.t0 = _context37["catch"](2);
+              return _context37.abrupt("return", this._handleError(_context37.t0));
             case 16:
             case "end":
-              return _context33.stop();
+              return _context37.stop();
           }
-        }, _callee33, this, [[2, 13]]);
+        }, _callee37, this, [[2, 13]]);
       }));
-      function get(_x20) {
+      function get(_x24) {
         return _get.apply(this, arguments);
       }
       return get;
@@ -2402,44 +2602,44 @@ var RbtApi = /*#__PURE__*/function () {
   }, {
     key: "post",
     value: (function () {
-      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(endpoint) {
+      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(endpoint) {
         var data,
           headers,
           response,
-          _args34 = arguments;
-        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+          _args38 = arguments;
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              data = _args34.length > 1 && _args34[1] !== undefined ? _args34[1] : {};
-              _context34.prev = 1;
+              data = _args38.length > 1 && _args38[1] !== undefined ? _args38[1] : {};
+              _context38.prev = 1;
               // Add the authToken to the headers
               headers = {
                 authtoken: this.authtoken
               }; // Make the POST request using Axios
-              _context34.next = 5;
+              _context38.next = 5;
               return this.axios.post(endpoint, data, {
                 headers: headers
               });
             case 5:
-              response = _context34.sent;
+              response = _context38.sent;
               if (!(response.data.ok === false)) {
-                _context34.next = 8;
+                _context38.next = 8;
                 break;
               }
-              return _context34.abrupt("return", this._handleError(response));
+              return _context38.abrupt("return", this._handleError(response));
             case 8:
-              return _context34.abrupt("return", response.data);
+              return _context38.abrupt("return", response.data);
             case 11:
-              _context34.prev = 11;
-              _context34.t0 = _context34["catch"](1);
-              return _context34.abrupt("return", this._handleError(_context34.t0));
+              _context38.prev = 11;
+              _context38.t0 = _context38["catch"](1);
+              return _context38.abrupt("return", this._handleError(_context38.t0));
             case 14:
             case "end":
-              return _context34.stop();
+              return _context38.stop();
           }
-        }, _callee34, this, [[1, 11]]);
+        }, _callee38, this, [[1, 11]]);
       }));
-      function post(_x21) {
+      function post(_x25) {
         return _post.apply(this, arguments);
       }
       return post;