@granular-software/sdk 0.4.35 → 0.4.36

package/dist/agent-evals.mjs

@@ -13866,13 +13866,27 @@ var Granular = class _Granular {
   registerEnvironmentImporter(ontologyNameOrId, handler) {
     this.ontologyImporters.set(ontologyNameOrId, handler);
     if (ontologyNameOrId.startsWith("sbx_")) {
-      this.sandboxImporters.set(ontologyNameOrId, handler);
+      this.sandboxImporters.set(ontologyNameOrId, {
+        handler,
+        sourceOntology: ontologyNameOrId
+      });
+      return;
+    }
+    for (const [sandboxId, importer] of this.sandboxImporters.entries()) {
+      if (importer.sourceOntology === ontologyNameOrId) {
+        this.sandboxImporters.set(sandboxId, {
+          handler,
+          sourceOntology: ontologyNameOrId
+        });
+      }
     }
   }
   clearEnvironmentImporter(ontologyNameOrId) {
     this.ontologyImporters.delete(ontologyNameOrId);
-    if (ontologyNameOrId.startsWith("sbx_")) {
-      this.sandboxImporters.delete(ontologyNameOrId);
+    for (const [sandboxId, importer] of this.sandboxImporters.entries()) {
+      if (importer.sourceOntology === ontologyNameOrId) {
+        this.sandboxImporters.delete(sandboxId);
+      }
     }
   }
   /**
@@ -14233,11 +14247,25 @@ var Granular = class _Granular {
     return this.connectSession({ sessionId, clientId: options?.clientId });
   }
   resolveEnvironmentImporter(requestedOntology, sandboxId) {
-    const resolved = this.sandboxImporters.get(sandboxId) || this.ontologyImporters.get(requestedOntology);
-    if (resolved && !this.sandboxImporters.has(sandboxId) && this.ontologyImporters.get(requestedOntology) === resolved) {
-      this.sandboxImporters.set(sandboxId, resolved);
+    const sandboxImporter = this.sandboxImporters.get(sandboxId);
+    if (sandboxImporter) {
+      const sourceImporter = this.ontologyImporters.get(
+        sandboxImporter.sourceOntology
+      );
+      if (sourceImporter === sandboxImporter.handler) {
+        return sandboxImporter.handler;
+      }
+      this.sandboxImporters.delete(sandboxId);
     }
-    return resolved;
+    const ontologyImporter = this.ontologyImporters.get(requestedOntology);
+    if (!ontologyImporter) {
+      return void 0;
+    }
+    this.sandboxImporters.set(sandboxId, {
+      handler: ontologyImporter,
+      sourceOntology: requestedOntology
+    });
+    return ontologyImporter;
   }
   async maybeRunEnvironmentImporter(resolved, environment) {
     if (!resolved.setupTriggerReason) {