@decocms/sandbox-controller 0.12.2 → 0.12.4

package/dist/index.d.ts

@@ -3835,6 +3835,12 @@ declare class FreestyleSandboxProvider implements SandboxProvider {
     private reclaim;
     /** True when it forked a repo snapshot: cloned, installed and serving. */
     private create;
+    /**
+     * Best-effort: a sandbox without org-fs still runs. Freestyle's edge can
+     * answer 502 for a moment after a VM starts, even after the daemon took
+     * its claim, and a missed relay leaves the turn without `/app/org`.
+     */
+    private relayOrgFsConfig;
     /**
      * The fork's first config: swap the snapshot's sentinel bearer for this
      * sandbox's own, retried until the new domain routes. A 401 means an earlier

package/dist/index.js

@@ -610,8 +610,8 @@ function normalizeCoAuthorIdentity(input) {
 
 // ../sandbox/server/daemon-client.ts
 var ConfigRequestError = class extends Error {
-  constructor(status, body) {
-    super(`sandbox daemon /_sandbox/config returned ${status}: ${body}`);
+  constructor(status, body, endpoint = "/_sandbox/config") {
+    super(`sandbox daemon ${endpoint} returned ${status}: ${body}`);
     this.status = status;
     this.name = "ConfigRequestError";
   }
@@ -747,8 +747,10 @@ async function postOrgFsConfig(daemonUrl, token, configJson) {
     CONFIG_TIMEOUT_MS
   );
   if (!res.ok) {
-    throw new Error(
-      `sandbox daemon /_sandbox/orgfs-config returned ${res.status}: ${res.body}`
+    throw new ConfigRequestError(
+      res.status,
+      res.body,
+      "/_sandbox/orgfs-config"
     );
   }
   return parseJsonResponse(
@@ -6760,7 +6762,7 @@ var Freestyle = class {
 // ../sandbox/package.json
 var package_default = {
   name: "@decocms/sandbox",
-  version: "1.93.2",
+  version: "1.93.4",
   private: true,
   type: "module",
   description: "Sandbox runtime for isolated Studio tool execution",
@@ -7260,11 +7262,11 @@ ${head}`).digest("hex").slice(0, 16)}`;
       await this.reclaim(found, sentinelSlug, opts);
     }
     if (opts.orgFsConfigJson) {
-      await postOrgFsConfig(
+      await this.relayOrgFsConfig(
         found.daemon.url,
         found.daemon.token,
         opts.orgFsConfigJson
-      ).catch((err) => console.warn(`[${LOG_LABEL2}] org-fs relay failed`, err));
+      );
     }
     const patch = gitCredentialRefreshPatch(opts);
     if (patch) {
@@ -7355,9 +7357,7 @@ ${head}`).digest("hex").slice(0, 16)}`;
       );
       step("claim");
       if (opts.orgFsConfigJson) {
-        await postOrgFsConfig(daemon.url, token, opts.orgFsConfigJson).catch(
-          (err) => console.warn(`[${LOG_LABEL2}] org-fs relay failed`, err)
-        );
+        await this.relayOrgFsConfig(daemon.url, token, opts.orgFsConfigJson);
       }
       step("orgfs-config");
       console.log(
@@ -7372,6 +7372,19 @@ ${head}`).digest("hex").slice(0, 16)}`;
     this.remember(handle, { vm, daemon });
     return repoSnapshot !== null;
   }
+  /**
+   * Best-effort: a sandbox without org-fs still runs. Freestyle's edge can
+   * answer 502 for a moment after a VM starts, even after the daemon took
+   * its claim, and a missed relay leaves the turn without `/app/org`.
+   */
+  async relayOrgFsConfig(url, token, configJson) {
+    await retry(() => postOrgFsConfig(url, token, configJson), {
+      maxAttempts: 8,
+      minTimeout: 250,
+      maxTimeout: 4e3,
+      isRetriable: (err) => err instanceof ConfigRequestError && err.status === 502
+    }).catch((err) => console.warn(`[${LOG_LABEL2}] org-fs relay failed`, err));
+  }
   /**
    * The fork's first config: swap the snapshot's sentinel bearer for this
    * sandbox's own, retried until the new domain routes. A 401 means an earlier

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/sandbox-controller",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "description": "Runs Studio agent sandboxes on Kubernetes, and serves them to a remote Studio.",
   "repository": {
     "type": "git",