jamdesk 1.1.164 → 1.1.166

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jamdesk",
-  "version": "1.1.164",
+  "version": "1.1.166",
   "description": "CLI for Jamdesk — build, preview, and deploy documentation sites from MDX. Dev server with hot reload, 50+ components, OpenAPI support, AI search, and Mintlify migration",
   "keywords": [
     "jamdesk",

package/vendored/lib/build/error-parser.ts

@@ -120,6 +120,79 @@ export function parseErrorDetails(
   const { pageToFileMap, discoveryHint, repoFullName } = opts;
   const lowerOutput = output.toLowerCase();
 
+  // R2 upload failure — our storage provider erred, never the customer's
+  // content. putWithRetry (scripts/upload-content-to-r2.ts) tags every
+  // failed put with this prefix; by the time we see it here the docs
+  // compiled fine and only the CDN upload failed. Checked before the
+  // generic timeout/OOM classifiers because R2 error text often contains
+  // "timeout". Transient indicators mirror isRetryableR2PutError's
+  // message heuristics — only those become `temporary` (= silently
+  // auto-retried); anything else (403 auth, missing bucket, misconfig)
+  // is platform breakage where a retry won't help and the customer +
+  // ops must hear about it immediately.
+  if (
+    phase === 'r2_upload' &&
+    (message.includes('R2 put failed') || lowerOutput.includes('r2 put failed'))
+  ) {
+    const r2Text = `${message} ${lowerOutput}`.toLowerCase();
+    const R2_TRANSIENT_INDICATORS = [
+      // Authoritative signal from putWithRetry (scripts/upload-content-to-r2.ts):
+      // its terminal catch appends "[retry envelope exhausted]" ONLY when the
+      // failure was retried the full 5 attempts by status code / error name /
+      // $retryable — a richer classification than the message-substring list
+      // below. It captures transient failures whose text matches none of those
+      // substrings (429 "Too Many Requests", SlowDown "Please reduce your
+      // request rate."). Checked first; the substrings below stay as a fallback
+      // for the SIGTERM/legacy paths that don't carry the marker.
+      'retry envelope exhausted',
+      'internal error',
+      'please try again',
+      'timeout',
+      // Bare Node socket errors ("connect ETIMEDOUT 1.2.3.4:443") do NOT
+      // contain the substring "timeout" (note the extra "d") — listed
+      // separately, mirroring isRetryableR2PutError which checks both.
+      'etimedout',
+      'econnreset',
+      'socket hang up',
+      'throttl',
+      'slow down',
+      'service unavailable',
+      // 502s can surface as a bare "Bad Gateway" body with none of the
+      // texts above — putWithRetry retries them by status code, so an
+      // exhaustion with this text is transient too.
+      'bad gateway',
+      // Matches putWithRetry's defensive post-loop fallback message
+      // ("R2 put retry loop exhausted"). That fallback is currently
+      // unreachable — the final attempt always rethrows the tagged
+      // original error — but match it anyway in case the loop structure
+      // changes; exhausting retries implies the error was transient.
+      'retry loop exhausted',
+    ];
+    if (R2_TRANSIENT_INDICATORS.some((s) => r2Text.includes(s))) {
+      return {
+        type: 'temporary',
+        message: 'Content upload failed',
+        details:
+          'Your documentation built successfully, but uploading it to our CDN hit a ' +
+          'temporary storage error on our side. Your content and repository are fine.',
+        suggestion:
+          "We'll retry this build automatically in a few minutes — no action needed; " +
+          'if a later build succeeded, this failure is already resolved. ' +
+          'If it keeps failing, click "Try Again" or contact support.',
+      };
+    }
+    return {
+      type: 'build_error',
+      message: 'Content upload failed',
+      details:
+        'Uploading your documentation to our CDN failed with a storage error on our ' +
+        'side. Your content and repository are fine.',
+      suggestion:
+        'This does not look like a passing glitch, so we have not scheduled an ' +
+        'automatic retry. Please contact support and quote the reference below.',
+    };
+  }
+
   // Extract error source information upfront - used by multiple error types
   const errorSource = extractErrorSource(output, pageToFileMap);
 

package/vendored/lib/interrupt-auto-retry.ts

@@ -0,0 +1,50 @@
+/**
+ * Auto-retry eligibility + customer-facing copy for the graceful-shutdown
+ * (SIGTERM/SIGINT) "Build interrupted" failure write in server.ts.
+ *
+ * Extracted as a pure seam (same rationale as lib/child-process.ts):
+ * server.ts starts the HTTP listener and registers the signal handlers at
+ * import time, so this logic is unit-tested here instead of through a full
+ * server import driving a real signal.
+ *
+ * Mirrors the reportFailure contract in firestore-reporter.ts exactly —
+ * Tasks 4/5 consume `autoRetryEligible === true` as meaning this rule
+ * regardless of which write path produced it:
+ * - autoRetriedFrom set → NOT eligible (once-only), and the suggestion is
+ *   rewritten to honest "we already retried" copy: this failure is the one
+ *   notification the customer receives during a persistent outage, so it
+ *   must not imply another retry is coming.
+ * - tarballKey set → NOT eligible (CLI/CI already saw the failure via
+ *   non-zero exit; silently publishing later would contradict their
+ *   recorded result).
+ * - JD_AUTO_RETRY_DISABLED=1 → NOT eligible (producer-side kill switch).
+ * - snap === null (doc read failed) → NOT eligible, generic copy
+ *   (fail-closed, legacy behavior).
+ */
+
+export interface InterruptBuildSnap {
+  get(field: string): unknown;
+}
+
+export function computeInterruptRetryFields(
+  snap: InterruptBuildSnap | null,
+  errorRef: string,
+  env: Record<string, string | undefined> = process.env,
+): { autoRetryEligible: boolean; errorSuggestion: string } {
+  const isAutoRetryBuild = Boolean(snap?.get('autoRetriedFrom'));
+  const autoRetryEligible =
+    snap !== null &&
+    env.JD_AUTO_RETRY_DISABLED !== '1' &&
+    !isAutoRetryBuild &&
+    !snap.get('tarballKey');
+
+  const reference = `\n\nIf you need help, provide this reference: ${errorRef}`;
+  const errorSuggestion = isAutoRetryBuild
+    ? 'We already retried this build automatically and it failed again — ' +
+      'this looks like a longer outage on our side. Please try again in a ' +
+      'few minutes, or contact support if it persists.' +
+      reference
+    : `This is temporary and should resolve itself. Please try again in a few minutes.${reference}`;
+
+  return { autoRetryEligible, errorSuggestion };
+}

package/vendored/lib/middleware-helpers.ts

@@ -684,14 +684,23 @@ const TRUSTED_PROXY_HEADERS = [
   'x-jd-project-name',
   'x-jd-project-logo',
   // Canonical override: middleware writes this when serving *.jamdesk.app
-  // directly for a hostAtDocs project that has a registered custom
-  // domain. The page render path uses it to emit the public-face canonical
-  // instead of the upstream subdomain URL.
+  // directly for a project (ANY hosting mode) whose registered custom
+  // domain passed domain-side validation (domain:<host> mapping points back
+  // at the slug + domainStatus active). The page render path uses it to
+  // emit the public-face canonical instead of the upstream subdomain URL.
   'x-jd-canonical-host',
-  // Set when *.jamdesk.app serves a hostAtDocs project that has NOT
-  // registered a custom domain yet — page emits robots: noindex so the
-  // upstream URL doesn't compete with the (yet-to-arrive) public face
-  // in search results.
+  // The registered domain's OWN serving mode ('true' | 'false', from
+  // domainCfg:<host>) — decides whether the canonical URL carries the
+  // /docs prefix. Only meaningful alongside x-jd-canonical-host; absent
+  // for legacy domains without a domainCfg record (page falls back to the
+  // projectCfg-derived hostAtDocs).
+  'x-jd-canonical-at-docs',
+  // Set when *.jamdesk.app serves a hostAtDocs project with no
+  // domain-validated custom domain (none registered, or the projectCfg
+  // mirror failed domain-side validation) — page emits robots: noindex so
+  // the upstream URL doesn't compete with the public face in search
+  // results. NEVER set for hostAtDocs=false tenants without a domain:
+  // their subdomain IS the public site.
   'x-jd-noindex',
 ] as const;
 
@@ -703,15 +712,25 @@ const TRUSTED_PROXY_HEADERS = [
 export interface BuildProjectHeadersOptions {
   /**
    * Public-face canonical host. Set when serving *.jamdesk.app directly
-   * for a hostAtDocs project that has a registered custom domain — the
-   * page render path emits this host in <link rel="canonical"> instead
-   * of the upstream subdomain.
+   * for a project (any hosting mode) whose registered custom domain passed
+   * domain-side validation — the page render path emits this host in
+   * <link rel="canonical"> instead of the upstream subdomain.
    */
   canonicalHost?: string;
+  /**
+   * The registered domain's OWN serving mode (domainCfg:<host>.hostAtDocs).
+   * Decides whether the canonical URL carries the /docs prefix — the
+   * projectCfg-side hostAtDocs describes how the SUBDOMAIN serves, which
+   * can diverge from the domain's live mode. undefined = legacy domain
+   * with no domainCfg record; the page falls back to the projectCfg-derived
+   * hostAtDocs. Only emitted when canonicalHost is set.
+   */
+  canonicalAtDocs?: boolean;
   /**
    * When true, emit `x-jd-noindex: true` so the page emits a robots
-   * noindex tag. Used for *.jamdesk.app subdomains of hostAtDocs
-   * projects without a custom domain yet.
+   * noindex tag. Used for *.jamdesk.app subdomains of hostAtDocs projects
+   * without a domain-validated custom domain. Never set for
+   * hostAtDocs=false tenants — their subdomain is the public site.
    */
   noindex?: boolean;
 }
@@ -724,6 +743,8 @@ export interface BuildProjectHeadersOptions {
  *   - x-host-at-docs       — whether docs are mounted at /docs
  *   - x-jd-language        — locale code if the path starts with one (e.g. /fr/...)
  *   - x-jd-canonical-host  — public-face host (opts.canonicalHost)
+ *   - x-jd-canonical-at-docs — domain's own /docs mode (opts.canonicalAtDocs;
+ *     only alongside x-jd-canonical-host)
  *   - x-jd-noindex         — "true" when opts.noindex is set
  *
  * Strips any client-supplied copies of those headers from the inbound
@@ -763,6 +784,10 @@ export function buildProjectHeaders(
 
   if (opts.canonicalHost) {
     newHeaders.set('x-jd-canonical-host', opts.canonicalHost);
+    // Only meaningful with a canonical host; getBaseUrl ignores it otherwise.
+    if (opts.canonicalAtDocs !== undefined) {
+      newHeaders.set('x-jd-canonical-at-docs', opts.canonicalAtDocs ? 'true' : 'false');
+    }
   }
   if (opts.noindex) {
     newHeaders.set('x-jd-noindex', 'true');

package/vendored/lib/page-isr-helpers.ts

@@ -132,14 +132,21 @@ export function parseCacheKey(cacheKey: string): { projectSlug: string; pagePath
  *
  * Header priority (highest first):
  *   1. x-jd-canonical-host  — internal override set by middleware when a
- *      hostAtDocs project is served directly via *.jamdesk.app and has a
- *      registered customDomain. Forces the canonical to the public face.
+ *      project (any hosting mode) is served directly via *.jamdesk.app and
+ *      its registered customDomain passed domain-side validation. Forces
+ *      the canonical to the public face. When present, the companion
+ *      x-jd-canonical-at-docs header (the DOMAIN's own serving mode, from
+ *      domainCfg:<host>) overrides the hostAtDocs param for the /docs
+ *      prefix decision — projectCfg's hostAtDocs describes how the
+ *      subdomain serves, which can diverge from the live domain mode.
+ *      Companion header absent (legacy domains without a domainCfg record)
+ *      → the hostAtDocs param decides, as before.
  *   2. x-jamdesk-forwarded-host — set by the Cloudflare Worker proxy
  *      (e.g. jamdesk.com → forwarded `jamdesk.com`).
  *   3. host header — direct request hostname.
  *   4. Subdomain fallback `<slug>.jamdesk.app` (no headers available).
  *
- * Both override headers are in TRUSTED_PROXY_HEADERS so a client can't
+ * All override headers are in TRUSTED_PROXY_HEADERS so a client can't
  * spoof them.
  *
  * When hostAtDocs=true, includes /docs path prefix (forwarded-host and
@@ -157,7 +164,13 @@ export function getBaseUrl(headers: Headers, projectSlug: string, hostAtDocs = f
 
   if (host) {
     const hostname = host.split(':')[0];
-    return hostAtDocs ? `https://${hostname}/docs` : `https://${hostname}`;
+    // Domain-mode override: only consulted when the canonical-host override
+    // is active (the companion header is only ever set alongside it).
+    const canonicalAtDocs = canonicalHost
+      ? headers.get('x-jd-canonical-at-docs')
+      : null;
+    const atDocs = canonicalAtDocs !== null ? canonicalAtDocs === 'true' : hostAtDocs;
+    return atDocs ? `https://${hostname}/docs` : `https://${hostname}`;
   }
 
   // Fallback to subdomain URL (subdomains always serve at root, never /docs)

package/vendored/lib/render-doc-page.tsx

@@ -256,10 +256,11 @@ export async function buildDocMetadata(input: RenderInput): Promise<Metadata> {
   const { slug: slugInput, projectSlug, hostAtDocs, requestHeaders } = input;
 
   // Middleware sets `x-jd-noindex: true` when serving a hostAtDocs project
-  // directly via *.jamdesk.app and the project has no registered custom
-  // domain yet. The upstream subdomain shouldn't compete with the (yet-to-
-  // arrive) public face in search results — emit robots noindex so Google
-  // skips it. See proxy.ts → projectHeaderOptsForCanonical for the source.
+  // directly via *.jamdesk.app and the project has no domain-validated
+  // custom domain (none registered, or the registration is stale/inactive).
+  // The upstream subdomain shouldn't compete with the public face in search
+  // results — emit robots noindex so Google skips it. See proxy.ts →
+  // projectHeaderOptsForCanonical for the source.
   const noindexHeader = requestHeaders?.get('x-jd-noindex') === 'true';
 
   if (isIsrMode()) {

package/vendored/lib/static-file-route.ts

@@ -43,10 +43,11 @@ const CONTENT_TYPES: Record<string, string> = {
  * have no business being served from a non-canonical host.
  *
  * `x-jd-noindex: true` is set by `proxy.ts` (`projectHeaderOptsForCanonical`)
- * when a project uses `hostAtDocs` WITHOUT a custom domain — i.e. its public
- * face is the raw `<slug>.jamdesk.app` subdomain with no canonical elsewhere.
- * Once a custom domain is registered, the header is replaced by a canonical-
- * host override and noindex is no longer set.
+ * when a project uses `hostAtDocs` WITHOUT a domain-validated custom domain
+ * — i.e. its public face is the raw `<slug>.jamdesk.app` subdomain with no
+ * canonical elsewhere. Once a custom domain is registered AND active, the
+ * header is replaced by a canonical-host override and noindex is no longer
+ * set.
  *
  * `robots.txt` is handled separately — it returns a Disallow-all directive,
  * not a 404, so crawlers get an explicit "don't crawl" signal.

package/vendored/workspace-package-lock.json

@@ -395,9 +395,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -414,9 +411,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -433,9 +427,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -452,9 +443,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -471,9 +459,6 @@
       "cpu": [
         "s390x"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -490,9 +475,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -509,9 +491,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -528,9 +507,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
@@ -547,9 +523,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -572,9 +545,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -597,9 +567,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -622,9 +589,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -647,9 +611,6 @@
       "cpu": [
         "s390x"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -672,9 +633,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -697,9 +655,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -722,9 +677,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -999,9 +951,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1018,9 +967,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1037,9 +983,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1056,9 +999,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1398,9 +1338,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1417,9 +1354,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1436,9 +1370,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1455,9 +1386,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3959,9 +3887,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -3982,9 +3907,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4005,9 +3927,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4028,9 +3947,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [