@granular-software/sdk 0.4.6 → 0.4.8

package/dist/index.d.mts

@@ -40,9 +40,13 @@ type GranularAuth = string;
  * A user/subject object returned from recordUser()
  */
 interface User {
-    /** Internal subject ID */
+    /** Internal Granular user identifier */
+    granularId: string;
+    /** External user identifier from your app */
+    userId: string;
+    /** @deprecated Use `granularId` instead */
     subjectId: string;
-    /** External identity ID (e.g. Auth0 ID) */
+    /** @deprecated Use `userId` instead */
     identityId: string;
     /** User's display name */
     name?: string;
@@ -68,6 +72,10 @@ interface RecordUserOptions {
  * Subject as returned from the API
  */
 interface Subject {
+    /** Internal Granular user identifier */
+    granularId: string;
+    /** External user identifier from your app */
+    userId: string;
     subjectId: string;
     tenantId: string;
     identityId: string;
@@ -83,8 +91,24 @@ interface Subject {
 interface ConnectOptions {
     /** The sandbox name or ID to connect to */
     sandbox: string;
-    /** The user to connect as (from recordUser()) */
-    user: User;
+    /**
+     * External user identifier from your app. This is the primary input for
+     * connecting to a sandbox and the only required user field in the common case.
+     */
+    userId?: string;
+    /**
+     * Internal Granular user identifier. Optional fallback when you only know
+     * the Granular-side ID for an existing subject.
+     */
+    granularId?: string;
+    /** Optional display name used when upserting the user */
+    name?: string;
+    /** Optional email used when upserting the user */
+    email?: string;
+    /** Permission profile IDs or names to ensure before connecting */
+    permissions?: string[];
+    /** Backwards-compatible user object returned from recordUser() */
+    user?: User;
     /** Optional stable client ID. Defaults to `client_${Date.now()}`. Use a fixed
      *  value for long-lived effect hosts so tool catalogs don't accumulate. */
     clientId?: string;
@@ -274,6 +298,8 @@ interface EffectHandlerContext {
     principalId?: string;
     permissionProfileId?: string;
     user: {
+        granularId?: string;
+        userId?: string;
         subjectId: string;
         identityId?: string;
         principalId?: string;
@@ -858,6 +884,7 @@ declare class Session {
     /** Last known tools for diffing */
     private lastKnownTools;
     constructor(client: WSClient, clientId?: string);
+    private extractDomainRevisionFromDoc;
     private buildLegacyEffectContext;
     get document(): Doc<Record<string, unknown>>;
     get domainRevision(): string | null;
@@ -1017,6 +1044,8 @@ declare class Environment extends Session {
     get sandboxId(): string;
     /** The subject ID */
     get subjectId(): string;
+    /** Internal Granular user identifier for this environment */
+    get granularId(): string;
     /** The permission profile ID */
     get permissionProfileId(): string;
     /** The GraphQL API endpoint URL */
@@ -1330,7 +1359,7 @@ declare class Granular {
      * Records/upserts a user and prepares them for sandbox connections
      *
      * @param options - User options
-     * @returns The user object to pass to connect()
+     * @returns The recorded user with both `userId` and `granularId`
      *
      * @example
      * ```typescript
@@ -1342,6 +1371,7 @@ declare class Granular {
      * ```
      */
     recordUser(options: RecordUserOptions): Promise<User>;
+    private resolveConnectUser;
     /**
      * Connect to a sandbox and establish a real-time environment session.
      *
@@ -1354,14 +1384,10 @@ declare class Granular {
      *
      * @example
      * ```typescript
-     * const user = await granular.recordUser({
-     *   userId: 'user_123',
-     *   permissions: ['agent'],
-     * });
-     *
      * const environment = await granular.connect({
      *   sandbox: 'my-sandbox',
-     *   user,
+     *   userId: 'user_123',
+     *   permissions: ['agent'],
      * });
      *
      * await granular.registerEffect('my-sandbox', {

package/dist/index.d.ts

@@ -40,9 +40,13 @@ type GranularAuth = string;
  * A user/subject object returned from recordUser()
  */
 interface User {
-    /** Internal subject ID */
+    /** Internal Granular user identifier */
+    granularId: string;
+    /** External user identifier from your app */
+    userId: string;
+    /** @deprecated Use `granularId` instead */
     subjectId: string;
-    /** External identity ID (e.g. Auth0 ID) */
+    /** @deprecated Use `userId` instead */
     identityId: string;
     /** User's display name */
     name?: string;
@@ -68,6 +72,10 @@ interface RecordUserOptions {
  * Subject as returned from the API
  */
 interface Subject {
+    /** Internal Granular user identifier */
+    granularId: string;
+    /** External user identifier from your app */
+    userId: string;
     subjectId: string;
     tenantId: string;
     identityId: string;
@@ -83,8 +91,24 @@ interface Subject {
 interface ConnectOptions {
     /** The sandbox name or ID to connect to */
     sandbox: string;
-    /** The user to connect as (from recordUser()) */
-    user: User;
+    /**
+     * External user identifier from your app. This is the primary input for
+     * connecting to a sandbox and the only required user field in the common case.
+     */
+    userId?: string;
+    /**
+     * Internal Granular user identifier. Optional fallback when you only know
+     * the Granular-side ID for an existing subject.
+     */
+    granularId?: string;
+    /** Optional display name used when upserting the user */
+    name?: string;
+    /** Optional email used when upserting the user */
+    email?: string;
+    /** Permission profile IDs or names to ensure before connecting */
+    permissions?: string[];
+    /** Backwards-compatible user object returned from recordUser() */
+    user?: User;
     /** Optional stable client ID. Defaults to `client_${Date.now()}`. Use a fixed
      *  value for long-lived effect hosts so tool catalogs don't accumulate. */
     clientId?: string;
@@ -274,6 +298,8 @@ interface EffectHandlerContext {
     principalId?: string;
     permissionProfileId?: string;
     user: {
+        granularId?: string;
+        userId?: string;
         subjectId: string;
         identityId?: string;
         principalId?: string;
@@ -858,6 +884,7 @@ declare class Session {
     /** Last known tools for diffing */
     private lastKnownTools;
     constructor(client: WSClient, clientId?: string);
+    private extractDomainRevisionFromDoc;
     private buildLegacyEffectContext;
     get document(): Doc<Record<string, unknown>>;
     get domainRevision(): string | null;
@@ -1017,6 +1044,8 @@ declare class Environment extends Session {
     get sandboxId(): string;
     /** The subject ID */
     get subjectId(): string;
+    /** Internal Granular user identifier for this environment */
+    get granularId(): string;
     /** The permission profile ID */
     get permissionProfileId(): string;
     /** The GraphQL API endpoint URL */
@@ -1330,7 +1359,7 @@ declare class Granular {
      * Records/upserts a user and prepares them for sandbox connections
      *
      * @param options - User options
-     * @returns The user object to pass to connect()
+     * @returns The recorded user with both `userId` and `granularId`
      *
      * @example
      * ```typescript
@@ -1342,6 +1371,7 @@ declare class Granular {
      * ```
      */
     recordUser(options: RecordUserOptions): Promise<User>;
+    private resolveConnectUser;
     /**
      * Connect to a sandbox and establish a real-time environment session.
      *
@@ -1354,14 +1384,10 @@ declare class Granular {
      *
      * @example
      * ```typescript
-     * const user = await granular.recordUser({
-     *   userId: 'user_123',
-     *   permissions: ['agent'],
-     * });
-     *
      * const environment = await granular.connect({
      *   sandbox: 'my-sandbox',
-     *   user,
+     *   userId: 'user_123',
+     *   permissions: ['agent'],
      * });
      *
      * await granular.registerEffect('my-sandbox', {

package/dist/index.js

@@ -4496,6 +4496,18 @@ var Session = class {
     this.setupEventHandlers();
     this.setupToolInvokeHandler();
   }
+  extractDomainRevisionFromDoc(doc) {
+    const domain = doc?.domain;
+    const active = domain?.active;
+    if (typeof active === "string" && active.trim()) {
+      return active;
+    }
+    const nestedRevision = active?.domainRevision;
+    if (typeof nestedRevision === "string" && nestedRevision.trim()) {
+      return nestedRevision;
+    }
+    return null;
+  }
   buildLegacyEffectContext() {
     return {
       effectClientId: this.clientId,
@@ -4503,6 +4515,8 @@ var Session = class {
       environmentId: "",
       sessionId: "",
       user: {
+        granularId: "",
+        userId: "",
         subjectId: ""
       }
     };
@@ -4588,7 +4602,14 @@ var Session = class {
    * execute locally and return the result to the sandbox.
    */
   async submitJob(code, domainRevision) {
-    const revision = domainRevision || this.currentDomainRevision || this.client.doc?.domain?.active || void 0;
+    let revision = domainRevision || this.currentDomainRevision || this.extractDomainRevisionFromDoc(this.client.doc) || void 0;
+    if (!revision) {
+      try {
+        const summary = await this.getDomain();
+        revision = summary.activeDomainRevision || this.extractDomainRevisionFromDoc(this.client.doc) || void 0;
+      } catch {
+      }
+    }
     if (!revision) {
       throw new Error("No domain revision available. Register live effects or ensure the build schema is activated.");
     }
@@ -4713,7 +4734,13 @@ var Session = class {
    * Get the current domain state and available tools
    */
   async getDomain() {
-    return this.client.call("domain.getSummary", {});
+    const summary = await this.client.call("domain.getSummary", {});
+    if (summary.activeDomainRevision) {
+      this.currentDomainRevision = summary.activeDomainRevision;
+    } else {
+      this.currentDomainRevision = this.extractDomainRevisionFromDoc(this.client.doc);
+    }
+    return summary;
   }
   /**
    * Fetch a domain package part from the backend (no fallback).
@@ -4931,6 +4958,7 @@ import { ${allImports} } from "./sandbox-tools";
   }
   setupEventHandlers() {
     this.client.on("sync", (doc) => {
+      this.currentDomainRevision = this.extractDomainRevisionFromDoc(doc);
       this.emit("sync", doc);
       this.checkForToolChanges();
     });
@@ -5197,6 +5225,29 @@ function normalizeHeapSnapshot(raw) {
     updatedAt: typeof heap.updatedAt === "number" ? heap.updatedAt : Date.now()
   };
 }
+function normalizeSubject(subject) {
+  const granularId = subject.granularId || subject.subjectId;
+  const userId = subject.userId || subject.identityId || granularId;
+  return {
+    ...subject,
+    granularId,
+    userId,
+    subjectId: granularId,
+    identityId: subject.identityId || userId
+  };
+}
+function normalizeUser(user) {
+  const granularId = user.granularId || user.subjectId;
+  const userId = user.userId || user.identityId || granularId;
+  return {
+    ...user,
+    granularId,
+    userId,
+    subjectId: granularId,
+    identityId: user.identityId || userId,
+    permissions: Array.isArray(user.permissions) ? user.permissions : []
+  };
+}
 var Environment = class _Environment extends Session {
   envData;
   _apiKey;
@@ -5219,6 +5270,10 @@ var Environment = class _Environment extends Session {
   get subjectId() {
     return this.envData.subjectId;
   }
+  /** Internal Granular user identifier for this environment */
+  get granularId() {
+    return this.envData.subjectId;
+  }
   /** The permission profile ID */
   get permissionProfileId() {
     return this.envData.permissionProfileId;
@@ -6016,7 +6071,7 @@ var Granular = class {
    * Records/upserts a user and prepares them for sandbox connections
    * 
    * @param options - User options
-   * @returns The user object to pass to connect()
+   * @returns The recorded user with both `userId` and `granularId`
    * 
    * @example
    * ```typescript
@@ -6028,21 +6083,61 @@ var Granular = class {
    * ```
    */
   async recordUser(options) {
-    const subject = await this.request("/control/subjects", {
+    const subject = normalizeSubject(await this.request("/control/subjects", {
       method: "POST",
       body: JSON.stringify({
         identityId: options.userId,
         name: options.name,
         email: options.email
       })
-    });
-    return {
+    }));
+    return normalizeUser({
+      granularId: subject.granularId,
+      userId: options.userId,
       subjectId: subject.subjectId,
-      identityId: options.userId,
-      name: options.name,
-      email: options.email,
+      identityId: subject.identityId,
+      name: options.name || subject.name || void 0,
+      email: options.email || subject.email || void 0,
       permissions: options.permissions || []
-    };
+    });
+  }
+  async resolveConnectUser(options) {
+    if (options.user) {
+      const user = normalizeUser(options.user);
+      return {
+        granularId: user.granularId,
+        userId: user.userId,
+        name: options.name || user.name,
+        email: options.email || user.email,
+        permissions: options.permissions || user.permissions
+      };
+    }
+    if (options.userId) {
+      const user = await this.recordUser({
+        userId: options.userId,
+        name: options.name,
+        email: options.email,
+        permissions: options.permissions
+      });
+      return {
+        granularId: user.granularId,
+        userId: user.userId,
+        name: user.name,
+        email: user.email,
+        permissions: options.permissions || user.permissions
+      };
+    }
+    if (options.granularId) {
+      const subject = await this.subjects.get(options.granularId);
+      return {
+        granularId: subject.granularId,
+        userId: subject.userId,
+        name: options.name || subject.name || void 0,
+        email: options.email || subject.email || void 0,
+        permissions: options.permissions || []
+      };
+    }
+    throw new Error("connect() requires either userId, granularId, or a user object returned by recordUser().");
   }
   /**
    * Connect to a sandbox and establish a real-time environment session.
@@ -6056,14 +6151,10 @@ var Granular = class {
    * 
    * @example
    * ```typescript
-   * const user = await granular.recordUser({
-   *   userId: 'user_123',
-   *   permissions: ['agent'],
-   * });
-   * 
    * const environment = await granular.connect({
    *   sandbox: 'my-sandbox',
-   *   user,
+   *   userId: 'user_123',
+   *   permissions: ['agent'],
    * });
    * 
    * await granular.registerEffect('my-sandbox', {
@@ -6084,13 +6175,14 @@ var Granular = class {
    */
   async connect(options) {
     const clientId = options.clientId || `client_${Date.now()}`;
+    const user = await this.resolveConnectUser(options);
     const sandbox = await this.findOrCreateSandbox(options.sandbox);
-    for (const profileName of options.user.permissions) {
+    for (const profileName of user.permissions) {
       const profileId = await this.ensurePermissionProfile(sandbox.sandboxId, profileName);
-      await this.ensureAssignment(options.user.subjectId, sandbox.sandboxId, profileId);
+      await this.ensureAssignment(user.granularId, sandbox.sandboxId, profileId);
     }
     const envData = await this.environments.create(sandbox.sandboxId, {
-      subjectId: options.user.subjectId,
+      subjectId: user.granularId,
       permissionProfileId: null
     });
     await this.activateEnvironment(envData.environmentId);
@@ -6523,7 +6615,7 @@ var Granular = class {
   get subjects() {
     return {
       get: async (subjectId) => {
-        return this.request(`/control/subjects/${subjectId}`);
+        return normalizeSubject(await this.request(`/control/subjects/${subjectId}`));
       },
       listAssignments: async (subjectId) => {
         return this.request(`/control/subjects/${subjectId}/assignments`);
@@ -6536,17 +6628,17 @@ var Granular = class {
   get users() {
     return {
       create: async (data) => {
-        return this.request("/control/subjects", {
+        return normalizeSubject(await this.request("/control/subjects", {
           method: "POST",
           body: JSON.stringify({
             identityId: data.id,
             name: data.name,
             email: data.email
           })
-        });
+        }));
       },
       get: async (id) => {
-        return this.request(`/control/subjects/${id}`);
+        return normalizeSubject(await this.request(`/control/subjects/${id}`));
       }
     };
   }