@granular-software/sdk 0.4.56 → 0.4.58

package/dist/agent-evals.d.mts

@@ -1,5 +1,5 @@
-import { a as EnvironmentSession, G as Granular } from './client-DL4S9uRc.mjs';
-import { G as GranularSpendContext, h as OpenAITokenSpend, P as Prompt, bW as RecordObjectOptions, cL as ManifestContent, c as SessionHeapSnapshot, T as ToolWithHandler, K as ConnectOptions, ag as CreateEnvironmentData, y as GranularOptions } from './spend-DpRRCrAr.mjs';
+import { a as EnvironmentSession, G as Granular } from './client-DFaCRSto.mjs';
+import { G as GranularSpendContext, h as OpenAITokenSpend, P as Prompt, bW as RecordObjectOptions, cL as ManifestContent, c as SessionHeapSnapshot, T as ToolWithHandler, K as ConnectOptions, ag as CreateEnvironmentData, y as GranularOptions } from './spend-czRX7l0X.mjs';
 import { GranularAgentToolInfo, GeneratedJobCodeIssue, BuildGranularAgentSystemPromptInput, HarnessRenderedPrompt, HarnessRenderedContinuation, HarnessControllerBudgets } from './agent-harness.mjs';
 import '@automerge/automerge';
 import '@automerge/automerge/slim';

package/dist/agent-evals.d.ts

@@ -1,5 +1,5 @@
-import { a as EnvironmentSession, G as Granular } from './client-BKde5VzV.js';
-import { G as GranularSpendContext, h as OpenAITokenSpend, P as Prompt, bW as RecordObjectOptions, cL as ManifestContent, c as SessionHeapSnapshot, T as ToolWithHandler, K as ConnectOptions, ag as CreateEnvironmentData, y as GranularOptions } from './spend-DpRRCrAr.js';
+import { a as EnvironmentSession, G as Granular } from './client-UdGt44dF.js';
+import { G as GranularSpendContext, h as OpenAITokenSpend, P as Prompt, bW as RecordObjectOptions, cL as ManifestContent, c as SessionHeapSnapshot, T as ToolWithHandler, K as ConnectOptions, ag as CreateEnvironmentData, y as GranularOptions } from './spend-czRX7l0X.js';
 import { GranularAgentToolInfo, GeneratedJobCodeIssue, BuildGranularAgentSystemPromptInput, HarnessRenderedPrompt, HarnessRenderedContinuation, HarnessControllerBudgets } from './agent-harness.js';
 import '@automerge/automerge';
 import '@automerge/automerge/slim';

package/dist/agent-evals.js

@@ -16537,24 +16537,72 @@ var Granular = class _Granular {
     if (!tagName) {
       throw new Error(`${methodName}() requires \`tag\`.`);
     }
-    const user = await this.resolveConnectUser(options);
-    if (!Array.isArray(user.permissions) || user.permissions.length === 0) {
+    const assignmentMode = options.assignmentMode ?? "ensure";
+    if (assignmentMode !== "ensure" && assignmentMode !== "require-existing") {
       throw new Error(
-        `${methodName}() requires at least one permission so the SDK can ensure assignments for new users.`
+        `${methodName}() received an unsupported assignmentMode: ${String(options.assignmentMode)}.`
       );
     }
-    const sandbox = await this.findOrCreateSandbox(ontology);
-    for (const profileName of user.permissions) {
-      const profileId = await this.ensurePermissionProfile(
-        sandbox.sandboxId,
-        profileName
+    const requiredGranularId = options.granularId?.trim();
+    if (assignmentMode === "require-existing" && (!requiredGranularId || options.userId || options.user)) {
+      throw new Error(
+        `${methodName}() with assignmentMode "require-existing" requires granularId and does not accept userId or user.`
       );
-      await this.ensureAssignment(
-        user.granularId,
-        sandbox.sandboxId,
-        profileId
+    }
+    const user = await this.resolveConnectUser(
+      assignmentMode === "require-existing" ? { ...options, granularId: requiredGranularId } : options
+    );
+    let requiredPermissionProfileId = null;
+    const sandbox = assignmentMode === "require-existing" ? { sandboxId: await this._resolveSandboxId(ontology) } : await this.findOrCreateSandbox(ontology);
+    if (assignmentMode === "require-existing") {
+      const assignments = await this.subjects.listAssignments(user.granularId);
+      const assignment = assignments.items.find(
+        (item) => item.sandboxId === sandbox.sandboxId
       );
+      if (!assignment) {
+        throw new Error(
+          `${methodName}() requires an existing assignment for subject ${user.granularId} in ontology ${sandbox.sandboxId}.`
+        );
+      }
+      const assignedPermissionProfileId = assignment.permissionProfileId?.trim();
+      if (!assignedPermissionProfileId) {
+        throw new Error(
+          `${methodName}() found an invalid assignment without a permission profile for subject ${user.granularId} in ontology ${sandbox.sandboxId}.`
+        );
+      }
+      const expectedPermissionProfileId = options.expectedPermissionProfileId?.trim();
+      if (expectedPermissionProfileId && assignedPermissionProfileId !== expectedPermissionProfileId) {
+        throw new Error(
+          `${methodName}() assignment mismatch for subject ${user.granularId}: expected permission profile ${expectedPermissionProfileId}, received ${assignedPermissionProfileId}.`
+        );
+      }
+      requiredPermissionProfileId = assignedPermissionProfileId;
+    } else {
+      if (!Array.isArray(user.permissions) || user.permissions.length === 0) {
+        throw new Error(
+          `${methodName}() requires at least one permission so the SDK can ensure assignments for new users.`
+        );
+      }
+      for (const profileName of user.permissions) {
+        const profileId = await this.ensurePermissionProfile(
+          sandbox.sandboxId,
+          profileName
+        );
+        await this.ensureAssignment(
+          user.granularId,
+          sandbox.sandboxId,
+          profileId
+        );
+      }
     }
+    const requireMatchingEnvironmentProfile = (environment2) => {
+      if (requiredPermissionProfileId && environment2.permissionProfileId !== requiredPermissionProfileId) {
+        throw new Error(
+          `${methodName}() resolved environment ${environment2.environmentId} with permission profile ${environment2.permissionProfileId || "none"}; current assignment requires ${requiredPermissionProfileId}.`
+        );
+      }
+      return environment2;
+    };
     const tags = await this.request(
       `/control/sandboxes/${sandbox.sandboxId}/tags`
     );
@@ -16577,6 +16625,9 @@ var Granular = class _Granular {
     const resolveActive = async (operationKey) => {
       const query = new URLSearchParams({ tagId: tag.tagId, slot });
       if (operationKey) query.set("operationKey", operationKey);
+      if (requiredPermissionProfileId) {
+        query.set("expectedPermissionProfileId", requiredPermissionProfileId);
+      }
       try {
         const payload = await this.request(
           `/control/sandboxes/${encodeURIComponent(sandbox.sandboxId)}/subjects/${encodeURIComponent(user.granularId)}/active-environment?${query.toString()}`
@@ -16600,7 +16651,8 @@ var Granular = class _Granular {
             tagId: tag.tagId,
             slot,
             operationKey: resetKey,
-            operation: resetKey ? "explicit_reset" : void 0
+            operation: resetKey ? "explicit_reset" : void 0,
+            expectedPermissionProfileId: requiredPermissionProfileId || void 0
           })
         }
       );
@@ -16610,7 +16662,7 @@ var Granular = class _Granular {
       const resetEnvironment = await resolveActive(resetKey);
       if (resetEnvironment) {
         return {
-          environment: resetEnvironment,
+          environment: requireMatchingEnvironmentProfile(resetEnvironment),
           requestedOntology: ontology,
           sandboxId: sandbox.sandboxId,
           subjectId: user.granularId,
@@ -16626,7 +16678,7 @@ var Granular = class _Granular {
       const active = await resolveActive();
       if (active && (active.versionId === targetVersionId || options.createFreshIfOutdated !== true)) {
         return {
-          environment: active,
+          environment: requireMatchingEnvironmentProfile(active),
           requestedOntology: ontology,
           sandboxId: sandbox.sandboxId,
           subjectId: user.granularId,
@@ -16644,7 +16696,10 @@ var Granular = class _Granular {
       )
     );
     if (!resetKey && currentMatches.length > 0) {
-      const environment2 = await activate(currentMatches[0]);
+      requireMatchingEnvironmentProfile(currentMatches[0]);
+      const environment2 = requireMatchingEnvironmentProfile(
+        await activate(currentMatches[0])
+      );
       return {
         environment: environment2,
         requestedOntology: ontology,
@@ -16657,7 +16712,10 @@ var Granular = class _Granular {
       userEnvironments.filter((environment2) => environment2.tagId === tag.tagId)
     );
     if (outdatedMatches.length > 0 && options.createFreshIfOutdated !== true) {
-      const environment2 = await activate(outdatedMatches[0]);
+      requireMatchingEnvironmentProfile(outdatedMatches[0]);
+      const environment2 = requireMatchingEnvironmentProfile(
+        await activate(outdatedMatches[0])
+      );
       return {
         environment: environment2,
         requestedOntology: ontology,
@@ -16676,7 +16734,10 @@ var Granular = class _Granular {
       tagId: tag.tagId,
       permissionProfileId: null
     });
-    const environment = await activate(created);
+    requireMatchingEnvironmentProfile(created);
+    const environment = requireMatchingEnvironmentProfile(
+      await activate(created)
+    );
     return {
       environment,
       requestedOntology: ontology,
@@ -16886,22 +16947,16 @@ var Granular = class _Granular {
       metadata: options?.metadata
     });
   }
-  /**
-   * Mark a session closed in the control plane. If `environment` is the connected handle for that
-   * `sessionId`, disconnects the WebSocket so the runtime tears down cleanly.
-   */
+  /** End a session through the runtime, or disconnect its connected handle. */
   async closeSession(sessionId, environment) {
     if (environment && environment.sessionId === sessionId) {
       await environment.disconnect();
       return;
     }
-    await this.request(`/control/sessions/${encodeURIComponent(sessionId)}`, {
-      method: "PATCH",
-      body: JSON.stringify({
-        status: "closed",
-        lastSeenAt: (/* @__PURE__ */ new Date()).toISOString()
-      })
-    });
+    await this.request(
+      `/control/sessions/${encodeURIComponent(sessionId)}/close`,
+      { method: "POST" }
+    );
   }
   /**
    * Re-open a closed session in the index and connect to its existing runtime document.