@ariobarin/glossa 0.2.0-beta.1 → 0.2.0-beta.2

package/dist/app.js

@@ -52027,6 +52027,14 @@ var DeviceRejectedError = class extends Error {
     this.name = "DeviceRejectedError";
   }
 };
+var RelayAccessProfileUnsupportedError = class extends Error {
+  constructor(profile) {
+    super(
+      `The relay needs an update before it can represent ${profile} access. Update the relay before reconnecting this workspace.`
+    );
+    this.name = "RelayAccessProfileUnsupportedError";
+  }
+};
 var RelayResponseError = class extends Error {
   constructor(status) {
     super(`The relay returned HTTP ${status}.`);
@@ -52166,7 +52174,9 @@ var RemoteWorker = class {
           await this.#pollGeneration(session);
         } catch (error46) {
           if (this.#signal.aborted) return;
-          if (error46 instanceof DeviceRejectedError) throw error46;
+          if (error46 instanceof DeviceRejectedError || error46 instanceof RelayAccessProfileUnsupportedError) {
+            throw error46;
+          }
           const delay4 = reconnectDelayMs(
             failures,
             this.#random,
@@ -52224,100 +52234,74 @@ var RemoteWorker = class {
       workerId: this.#workerId,
       capabilities: { commandProgress: true, concurrentJobs: true }
     };
-    const versionedCurrentBody = this.#workerVersion ? { ...currentBody, workerVersion: this.#workerVersion } : void 0;
-    const versionedMutationBody = this.#workerVersion ? { ...mutationBody, workerVersion: this.#workerVersion } : void 0;
-    const versionedStructuredBody = this.#workerVersion ? { ...structuredBody, workerVersion: this.#workerVersion } : void 0;
-    const preferredProfileBody = this.#accessProfile ? {
-      ...versionedCurrentBody ?? currentBody,
-      accessProfile: this.#accessProfile,
-      ...this.#workspaceLabel ? { workspaceLabel: this.#workspaceLabel } : {}
-    } : void 0;
-    const attempts = [
-      ...preferredProfileBody ? [{ body: preferredProfileBody, legacyRelay: false }] : [],
-      ...versionedCurrentBody && this.#workspaceLabel ? [{
-        body: {
-          ...versionedCurrentBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...this.#workspaceLabel ? [{
-        body: {
-          ...currentBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...versionedCurrentBody ? [{ body: versionedCurrentBody, legacyRelay: false }] : [],
+    const capabilityBodies = [
+      currentBody,
+      mutationBody,
+      structuredBody,
+      concurrentBody,
       {
-        body: currentBody,
-        legacyRelay: false
-      },
-      ...versionedMutationBody && this.#workspaceLabel ? [{
-        body: {
-          ...versionedMutationBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...this.#workspaceLabel ? [{
-        body: {
-          ...mutationBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...versionedMutationBody ? [{ body: versionedMutationBody, legacyRelay: false }] : [],
-      {
-        body: mutationBody,
-        legacyRelay: false
+        workerId: this.#workerId,
+        capabilities: { commandProgress: true }
       },
-      ...versionedStructuredBody && this.#workspaceLabel ? [{
-        body: {
-          ...versionedStructuredBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...this.#workspaceLabel ? [{
-        body: {
-          ...structuredBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
-      }] : [],
-      ...versionedStructuredBody ? [{ body: versionedStructuredBody, legacyRelay: false }] : [],
+      { workerId: this.#workerId }
+    ];
+    const metadataPhases = [
       {
-        body: structuredBody,
-        legacyRelay: false
+        includeVersion: Boolean(this.#workerVersion),
+        includeLabel: Boolean(this.#workspaceLabel)
       },
       ...this.#workspaceLabel ? [{
-        body: {
-          ...concurrentBody,
-          workspaceLabel: this.#workspaceLabel
-        },
-        legacyRelay: false
+        includeVersion: Boolean(this.#workerVersion),
+        includeLabel: false
       }] : [],
-      {
-        body: concurrentBody,
-        legacyRelay: false
-      },
-      {
-        body: {
-          workerId: this.#workerId,
-          capabilities: { commandProgress: true }
-        },
-        legacyRelay: false
-      },
-      { body: { workerId: this.#workerId }, legacyRelay: false },
-      { body: {}, legacyRelay: true }
+      ...this.#workerVersion && this.#workspaceLabel ? [{ includeVersion: false, includeLabel: true }] : [],
+      { includeVersion: false, includeLabel: false }
     ];
-    for (const [index, attempt] of attempts.entries()) {
+    const attempts = [];
+    const seenAttempts = /* @__PURE__ */ new Set();
+    const pushAttempt = (base, includeProfile, includeVersion, includeLabel, legacyRelay = false) => {
+      const body = {
+        ...base,
+        ...includeProfile && this.#accessProfile ? { accessProfile: this.#accessProfile } : {},
+        ...includeVersion && this.#workerVersion ? { workerVersion: this.#workerVersion } : {},
+        ...includeLabel && this.#workspaceLabel ? { workspaceLabel: this.#workspaceLabel } : {}
+      };
+      const key = JSON.stringify(body);
+      if (seenAttempts.has(key)) return;
+      seenAttempts.add(key);
+      attempts.push({ body, legacyRelay, profileIncluded: includeProfile });
+    };
+    if (this.#accessProfile) {
+      for (const metadata of metadataPhases) {
+        for (const body of capabilityBodies) {
+          pushAttempt(
+            body,
+            true,
+            metadata.includeVersion,
+            metadata.includeLabel
+          );
+        }
+      }
+    }
+    if (this.#accessProfile === void 0 || this.#accessProfile === "system") {
+      for (const metadata of metadataPhases) {
+        for (const body of capabilityBodies) {
+          pushAttempt(
+            body,
+            false,
+            metadata.includeVersion,
+            metadata.includeLabel
+          );
+        }
+      }
+      attempts.push({ body: {}, legacyRelay: true, profileIncluded: false });
+    }
+    for (const attempt of attempts) {
       let response;
       try {
         response = await this.#post("/device/register", attempt.body);
       } catch (error46) {
-        if (error46 instanceof RelayResponseError && error46.status === 400 && index < attempts.length - 1) {
+        if (error46 instanceof RelayResponseError && error46.status === 400) {
           continue;
         }
         throw error46;
@@ -52337,11 +52321,14 @@ var RemoteWorker = class {
         structuredReads: !attempt.legacyRelay && supportsCapability(value, "structuredReads"),
         structuredMutations: !attempt.legacyRelay && supportsCapability(value, "structuredMutations"),
         commandOutputRanges: !attempt.legacyRelay && supportsCapability(value, "commandOutputRanges"),
-        accessProfileAccepted: this.#accessProfile === void 0 || "accessProfile" in value && value.accessProfile === this.#accessProfile,
+        accessProfileAccepted: this.#accessProfile === void 0 || "accessProfile" in value && value.accessProfile === this.#accessProfile || this.#accessProfile === "system" && !attempt.profileIncluded,
         workspaceLabelAccepted: this.#workspaceLabel === void 0 || "workspaceLabel" in value && value.workspaceLabel === this.#workspaceLabel,
         ...workerToken ? { workerToken } : {}
       };
     }
+    if (this.#accessProfile && this.#accessProfile !== "system") {
+      throw new RelayAccessProfileUnsupportedError(this.#accessProfile);
+    }
     throw new Error("The relay rejected every supported registration shape.");
   }
   async #pollGeneration(session) {
@@ -54677,7 +54664,7 @@ async function acquireWorkspaceLease(root, options = {}) {
 }
 
 // src/main.ts
-var VERSION = "0.2.0-beta.1";
+var VERSION = "0.2.0-beta.2";
 var DISTRIBUTION = "npm";
 var HELP = `Glossa ${VERSION}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariobarin/glossa",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "private": false,
   "description": "Connect an explicitly exposed local coding workspace to the Glossa MCP relay.",
   "type": "module",