@riddledc/openclaw-riddledc 0.9.1 → 0.9.3

package/dist/index.cjs

@@ -24,12 +24,231 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_typebox = require("@sinclair/typebox");
+var import_promises2 = require("fs/promises");
+var import_node_path2 = require("path");
+var import_node_child_process2 = require("child_process");
+var import_node_util2 = require("util");
+
+// src/core.ts
+var import_node_child_process = require("child_process");
 var import_promises = require("fs/promises");
 var import_node_path = require("path");
-var import_node_child_process = require("child_process");
 var import_node_util = require("util");
 var execFile = (0, import_node_util.promisify)(import_node_child_process.execFile);
 var INLINE_CAP = 50 * 1024;
+var PREVIEW_REQUEST_TIMEOUT_MS = 3e4;
+var PREVIEW_UPLOAD_TIMEOUT_MS = 5 * 6e4;
+var PREVIEW_RETRY_ATTEMPTS = 3;
+var PREVIEW_RETRY_BASE_DELAY_MS = 750;
+function configFromOpenClawApi(api) {
+  const cfg = api?.config ?? {};
+  const pluginCfg = cfg?.plugins?.entries?.["openclaw-riddledc"]?.config ?? {};
+  return {
+    apiKey: process.env.RIDDLE_API_KEY || pluginCfg.apiKey,
+    baseUrl: pluginCfg.baseUrl || "https://api.riddledc.com",
+    workspace: api?.workspacePath ?? process.cwd()
+  };
+}
+function requireConfig(config) {
+  const apiKey = config.apiKey || process.env.RIDDLE_API_KEY;
+  const baseUrl = config.baseUrl || "https://api.riddledc.com";
+  if (!apiKey) {
+    throw new Error("Missing Riddle API key. Set RIDDLE_API_KEY env var or configure a Riddle API key.");
+  }
+  assertAllowedBaseUrl(baseUrl);
+  return { apiKey, baseUrl, workspace: config.workspace || process.cwd() };
+}
+function assertAllowedBaseUrl(baseUrl) {
+  const url = new URL(baseUrl);
+  if (url.protocol !== "https:") throw new Error(`Riddle baseUrl must be https: (${baseUrl})`);
+  if (url.hostname !== "api.riddledc.com") {
+    throw new Error(`Refusing to use non-official Riddle host: ${url.hostname}`);
+  }
+}
+function describeError(err) {
+  const anyErr = err;
+  const parts = [];
+  if (err instanceof Error) parts.push(err.message);
+  else parts.push(String(err));
+  const cause = anyErr?.cause;
+  if (cause) {
+    const causeParts = [
+      cause.code ? `code=${cause.code}` : "",
+      cause.name ? `name=${cause.name}` : "",
+      cause.message ? `message=${cause.message}` : ""
+    ].filter(Boolean);
+    if (causeParts.length) parts.push(`cause: ${causeParts.join(" ")}`);
+  }
+  return parts.join("; ");
+}
+async function fetchWithTimeout(url, init, timeoutMs, label) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(url, { ...init, signal: controller.signal });
+  } catch (err) {
+    if (err?.name === "AbortError") {
+      throw new Error(`${label} timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function isTransientFetchError(err) {
+  const text = describeError(err).toLowerCase();
+  return [
+    "fetch failed",
+    "timed out",
+    "timeout",
+    "econnreset",
+    "econnrefused",
+    "etimedout",
+    "eai_again",
+    "socket",
+    "network",
+    "und_err",
+    "terminated"
+  ].some((needle) => text.includes(needle));
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function fetchWithRetry(url, init, timeoutMs, label, opts = {}) {
+  const attempts = Math.max(1, opts.attempts ?? PREVIEW_RETRY_ATTEMPTS);
+  const baseDelayMs = opts.baseDelayMs ?? PREVIEW_RETRY_BASE_DELAY_MS;
+  let lastErr;
+  for (let attempt = 1; attempt <= attempts; attempt++) {
+    try {
+      return await fetchWithTimeout(url, init, timeoutMs, label);
+    } catch (err) {
+      lastErr = err;
+      if (attempt >= attempts || !isTransientFetchError(err)) break;
+      const jitterMs = Math.floor(Math.random() * 250);
+      const delayMs = Math.min(baseDelayMs * Math.pow(2, attempt - 1) + jitterMs, 5e3);
+      console.warn(`[openclaw-riddledc] ${label} attempt ${attempt}/${attempts} failed: ${describeError(err)}; retrying in ${delayMs}ms`);
+      await sleep(delayMs);
+    }
+  }
+  throw new Error(`${label} failed after ${attempts} attempts: ${describeError(lastErr)}`);
+}
+async function assertDirectory(dir) {
+  if (!dir || typeof dir !== "string") throw new Error("directory must be an absolute path");
+  try {
+    const st = await (0, import_promises.stat)(dir);
+    if (!st.isDirectory()) throw new Error(`Not a directory: ${dir}`);
+  } catch (e) {
+    return { ok: false, error: `Cannot access directory: ${e.message}` };
+  }
+  return null;
+}
+async function tarDirectory(dir, tarball, excludes, timeout) {
+  const excludeArgs = excludes.flatMap((p) => ["--exclude", p]);
+  await execFile("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout });
+  return (0, import_promises.readFile)(tarball);
+}
+async function createStaticPreview(config, params) {
+  let cfg;
+  try {
+    cfg = requireConfig(config);
+  } catch (err) {
+    return { ok: false, error: err.message };
+  }
+  const dirError = await assertDirectory(params.directory);
+  if (dirError) return dirError;
+  const endpoint = cfg.baseUrl.replace(/\/$/, "");
+  let createRes;
+  try {
+    createRes = await fetchWithRetry(`${endpoint}/v1/preview`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${cfg.apiKey}`, "Content-Type": "application/json" },
+      body: JSON.stringify({ framework: params.framework || "spa" })
+    }, PREVIEW_REQUEST_TIMEOUT_MS, "preview create");
+  } catch (e) {
+    return { ok: false, error: `Create failed: ${describeError(e)}` };
+  }
+  if (!createRes.ok) {
+    const err = await createRes.text();
+    return { ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` };
+  }
+  const created = await createRes.json();
+  const tarball = `/tmp/riddle-preview-${created.id}.tar.gz`;
+  try {
+    const tarData = await tarDirectory(params.directory, tarball, [], 6e4);
+    let uploadRes;
+    try {
+      uploadRes = await fetchWithRetry(created.upload_url, {
+        method: "PUT",
+        headers: { "Content-Type": "application/gzip" },
+        body: tarData
+      }, PREVIEW_UPLOAD_TIMEOUT_MS, "preview upload");
+    } catch (e) {
+      return { ok: false, id: created.id, error: `Upload failed: ${describeError(e)}` };
+    }
+    if (!uploadRes.ok) {
+      return { ok: false, id: created.id, error: `Upload failed: HTTP ${uploadRes.status}` };
+    }
+  } finally {
+    try {
+      await (0, import_promises.rm)(tarball, { force: true });
+    } catch {
+    }
+  }
+  let publishRes;
+  try {
+    publishRes = await fetchWithTimeout(`${endpoint}/v1/preview/${created.id}/publish`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${cfg.apiKey}` }
+    }, PREVIEW_REQUEST_TIMEOUT_MS, "preview publish");
+  } catch (e) {
+    return { ok: false, id: created.id, error: `Publish failed: ${describeError(e)}` };
+  }
+  if (!publishRes.ok) {
+    const err = await publishRes.text();
+    return { ok: false, id: created.id, error: `Publish failed: HTTP ${publishRes.status} ${err}` };
+  }
+  const published = await publishRes.json();
+  return {
+    ok: true,
+    id: published.id,
+    preview_url: published.preview_url,
+    file_count: published.file_count,
+    total_bytes: published.total_bytes,
+    expires_at: created.expires_at
+  };
+}
+async function deleteStaticPreview(config, id) {
+  let cfg;
+  try {
+    cfg = requireConfig(config);
+  } catch (err) {
+    return { ok: false, error: err.message };
+  }
+  let res;
+  try {
+    res = await fetchWithTimeout(`${cfg.baseUrl.replace(/\/$/, "")}/v1/preview/${id}`, {
+      method: "DELETE",
+      headers: { Authorization: `Bearer ${cfg.apiKey}` }
+    }, PREVIEW_REQUEST_TIMEOUT_MS, "preview delete");
+  } catch (e) {
+    return { ok: false, error: `Delete failed: ${describeError(e)}` };
+  }
+  if (!res.ok) {
+    const err = await res.text();
+    return { ok: false, error: `Delete failed: HTTP ${res.status} ${err}` };
+  }
+  const data = await res.json();
+  return { ok: true, deleted: true, files_removed: data.files_removed };
+}
+
+// src/index.ts
+var execFile2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
+var INLINE_CAP2 = 50 * 1024;
+var PREVIEW_REQUEST_TIMEOUT_MS2 = 3e4;
+var PREVIEW_UPLOAD_TIMEOUT_MS2 = 5 * 6e4;
+var PREVIEW_ARTIFACT_TIMEOUT_MS = 6e4;
+var PREVIEW_RETRY_ATTEMPTS2 = 3;
+var PREVIEW_RETRY_BASE_DELAY_MS2 = 750;
 function getCfg(api) {
   const cfg = api?.config ?? {};
   const pluginCfg = cfg?.plugins?.entries?.["openclaw-riddledc"]?.config ?? {};
@@ -38,7 +257,7 @@ function getCfg(api) {
     baseUrl: pluginCfg.baseUrl || "https://api.riddledc.com"
   };
 }
-function assertAllowedBaseUrl(baseUrl) {
+function assertAllowedBaseUrl2(baseUrl) {
   const url = new URL(baseUrl);
   if (url.protocol !== "https:") throw new Error(`Riddle baseUrl must be https: (${baseUrl})`);
   if (url.hostname !== "api.riddledc.com") {
@@ -75,20 +294,90 @@ function abToBase64(ab) {
 function getWorkspacePath(api) {
   return api?.workspacePath ?? process.cwd();
 }
+function describeError2(err) {
+  const anyErr = err;
+  const parts = [];
+  if (err instanceof Error) parts.push(err.message);
+  else parts.push(String(err));
+  const cause = anyErr?.cause;
+  if (cause) {
+    const causeParts = [
+      cause.code ? `code=${cause.code}` : "",
+      cause.name ? `name=${cause.name}` : "",
+      cause.message ? `message=${cause.message}` : ""
+    ].filter(Boolean);
+    if (causeParts.length) parts.push(`cause: ${causeParts.join(" ")}`);
+  }
+  return parts.join("; ");
+}
+async function fetchWithTimeout2(url, init, timeoutMs, label) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(url, { ...init, signal: controller.signal });
+  } catch (err) {
+    if (err?.name === "AbortError") {
+      throw new Error(`${label} timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function isTransientFetchError2(err) {
+  const text = describeError2(err).toLowerCase();
+  return [
+    "fetch failed",
+    "timed out",
+    "timeout",
+    "econnreset",
+    "econnrefused",
+    "etimedout",
+    "eai_again",
+    "socket",
+    "network",
+    "und_err",
+    "terminated"
+  ].some((needle) => text.includes(needle));
+}
+function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function fetchWithRetry2(url, init, timeoutMs, label, opts = {}) {
+  const attempts = Math.max(1, opts.attempts ?? PREVIEW_RETRY_ATTEMPTS2);
+  const baseDelayMs = opts.baseDelayMs ?? PREVIEW_RETRY_BASE_DELAY_MS2;
+  let lastErr;
+  for (let attempt = 1; attempt <= attempts; attempt++) {
+    try {
+      return await fetchWithTimeout2(url, init, timeoutMs, label);
+    } catch (err) {
+      lastErr = err;
+      if (attempt >= attempts || !isTransientFetchError2(err)) break;
+      const jitterMs = Math.floor(Math.random() * 250);
+      const delayMs = Math.min(baseDelayMs * Math.pow(2, attempt - 1) + jitterMs, 5e3);
+      console.warn(`[openclaw-riddledc] ${label} attempt ${attempt}/${attempts} failed: ${describeError2(err)}; retrying in ${delayMs}ms`);
+      await sleep2(delayMs);
+    }
+  }
+  throw new Error(`${label} failed after ${attempts} attempts: ${describeError2(lastErr)}`);
+}
+function isAlreadyStartedResponse(status, body) {
+  return status === 409 && /already in status:\s*(queued|running|complete|completed)/i.test(body);
+}
 async function writeArtifact(workspace, subdir, filename, content) {
-  const dir = (0, import_node_path.join)(workspace, "riddle", subdir);
-  await (0, import_promises.mkdir)(dir, { recursive: true });
-  const filePath = (0, import_node_path.join)(dir, filename);
+  const dir = (0, import_node_path2.join)(workspace, "riddle", subdir);
+  await (0, import_promises2.mkdir)(dir, { recursive: true });
+  const filePath = (0, import_node_path2.join)(dir, filename);
   const buf = Buffer.from(content, "utf8");
-  await (0, import_promises.writeFile)(filePath, buf);
+  await (0, import_promises2.writeFile)(filePath, buf);
   return { path: filePath, sizeBytes: buf.byteLength };
 }
 async function writeArtifactBinary(workspace, subdir, filename, base64Content) {
-  const dir = (0, import_node_path.join)(workspace, "riddle", subdir);
-  await (0, import_promises.mkdir)(dir, { recursive: true });
-  const filePath = (0, import_node_path.join)(dir, filename);
+  const dir = (0, import_node_path2.join)(workspace, "riddle", subdir);
+  await (0, import_promises2.mkdir)(dir, { recursive: true });
+  const filePath = (0, import_node_path2.join)(dir, filename);
   const buf = Buffer.from(base64Content, "base64");
-  await (0, import_promises.writeFile)(filePath, buf);
+  await (0, import_promises2.writeFile)(filePath, buf);
   return { path: filePath, sizeBytes: buf.byteLength };
 }
 async function applySafetySpec(result, opts) {
@@ -132,10 +421,10 @@ async function applySafetySpec(result, opts) {
   if (result.har != null) {
     const harStr = typeof result.har === "string" ? result.har : JSON.stringify(result.har);
     const harBytes = Buffer.byteLength(harStr, "utf8");
-    if (opts.harInline && harBytes <= INLINE_CAP) {
+    if (opts.harInline && harBytes <= INLINE_CAP2) {
     } else {
       const ref = await writeArtifact(opts.workspace, "har", `${jobId}.har.json`, harStr);
-      if (opts.harInline && harBytes > INLINE_CAP) {
+      if (opts.harInline && harBytes > INLINE_CAP2) {
         result.har = { saved: ref.path, sizeBytes: ref.sizeBytes, warning: "Exceeded 50KB inline cap; wrote to file" };
       } else {
         result.har = { saved: ref.path, sizeBytes: ref.sizeBytes };
@@ -145,7 +434,7 @@ async function applySafetySpec(result, opts) {
   if (result.console != null) {
     const consoleStr = typeof result.console === "string" ? result.console : JSON.stringify(result.console);
     const consoleBytes = Buffer.byteLength(consoleStr, "utf8");
-    if (consoleBytes > INLINE_CAP) {
+    if (consoleBytes > INLINE_CAP2) {
       const ref = await writeArtifact(opts.workspace, "console", `${jobId}.log`, consoleStr);
       result.console = { saved: ref.path, sizeBytes: ref.sizeBytes };
     }
@@ -248,7 +537,7 @@ async function runWithDefaults(api, payload, defaults) {
       error: "Missing Riddle API key. Set RIDDLE_API_KEY env var or plugins.entries.riddle.config.apiKey."
     };
   }
-  assertAllowedBaseUrl(baseUrl);
+  assertAllowedBaseUrl2(baseUrl);
   const mode = detectMode(payload);
   const userInclude = payload.include ?? [];
   const userRequestedHar = userInclude.includes("har");
@@ -400,7 +689,7 @@ function register(api) {
         if (!apiKey) {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
         }
-        assertAllowedBaseUrl(baseUrl);
+        assertAllowedBaseUrl2(baseUrl);
         const res = await fetch(`${baseUrl.replace(/\/$/, "")}/v1/jobs/${params.job_id}`, {
           headers: { Authorization: `Bearer ${apiKey}` }
         });
@@ -809,70 +1098,8 @@ function register(api) {
         framework: import_typebox.Type.Optional(import_typebox.Type.String({ description: "Framework hint: 'spa' (default) or 'static'" }))
       }),
       async execute(_id, params) {
-        const { apiKey, baseUrl } = getCfg(api);
-        if (!apiKey) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
-        }
-        assertAllowedBaseUrl(baseUrl);
-        const dir = params.directory;
-        if (!dir || typeof dir !== "string") throw new Error("directory must be an absolute path");
-        try {
-          const st = await (0, import_promises.stat)(dir);
-          if (!st.isDirectory()) throw new Error(`Not a directory: ${dir}`);
-        } catch (e) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Cannot access directory: ${e.message}` }, null, 2) }] };
-        }
-        const endpoint = baseUrl.replace(/\/$/, "");
-        const createRes = await fetch(`${endpoint}/v1/preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify({ framework: params.framework || "spa" })
-        });
-        if (!createRes.ok) {
-          const err = await createRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
-        }
-        const created = await createRes.json();
-        const tarball = `/tmp/riddle-preview-${created.id}.tar.gz`;
-        try {
-          await execFile("tar", ["czf", tarball, "-C", dir, "."], { timeout: 6e4 });
-          const tarData = await (0, import_promises.readFile)(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
-          if (!uploadRes.ok) {
-            return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
-          }
-        } finally {
-          try {
-            await (0, import_promises.rm)(tarball, { force: true });
-          } catch {
-          }
-        }
-        const publishRes = await fetch(`${endpoint}/v1/preview/${created.id}/publish`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
-        if (!publishRes.ok) {
-          const err = await publishRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Publish failed: HTTP ${publishRes.status} ${err}` }, null, 2) }] };
-        }
-        const published = await publishRes.json();
-        return {
-          content: [{
-            type: "text",
-            text: JSON.stringify({
-              ok: true,
-              id: published.id,
-              preview_url: published.preview_url,
-              file_count: published.file_count,
-              total_bytes: published.total_bytes,
-              expires_at: created.expires_at
-            }, null, 2)
-          }]
-        };
+        const result = await createStaticPreview(configFromOpenClawApi(api), params);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
     },
     { optional: true }
@@ -885,21 +1112,8 @@ function register(api) {
         id: import_typebox.Type.String({ description: "Preview ID (e.g. pv_a1b2c3d4)" })
       }),
       async execute(_id, params) {
-        const { apiKey, baseUrl } = getCfg(api);
-        if (!apiKey) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
-        }
-        assertAllowedBaseUrl(baseUrl);
-        const res = await fetch(`${baseUrl.replace(/\/$/, "")}/v1/preview/${params.id}`, {
-          method: "DELETE",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
-        if (!res.ok) {
-          const err = await res.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Delete failed: HTTP ${res.status} ${err}` }, null, 2) }] };
-        }
-        const data = await res.json();
-        return { content: [{ type: "text", text: JSON.stringify({ ok: true, deleted: true, files_removed: data.files_removed }, null, 2) }] };
+        const result = await deleteStaticPreview(configFromOpenClawApi(api), params.id);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
     },
     { optional: true }
@@ -934,11 +1148,11 @@ function register(api) {
         if (!apiKey) {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
         }
-        assertAllowedBaseUrl(baseUrl);
+        assertAllowedBaseUrl2(baseUrl);
         const dir = params.directory;
         if (!dir || typeof dir !== "string") throw new Error("directory must be an absolute path");
         try {
-          const st = await (0, import_promises.stat)(dir);
+          const st = await (0, import_promises2.stat)(dir);
           if (!st.isDirectory()) throw new Error(`Not a directory: ${dir}`);
         } catch (e) {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Cannot access directory: ${e.message}` }, null, 2) }] };
@@ -951,11 +1165,16 @@ function register(api) {
           const envBody = {};
           if (hasSensitiveEnv) envBody.env = params.sensitive_env;
           if (hasLocalStorage) envBody.localStorage = params.localStorage;
-          const envRes = await fetch(`${endpoint}/v1/server-preview/env`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-            body: JSON.stringify(envBody)
-          });
+          let envRes;
+          try {
+            envRes = await fetchWithTimeout2(`${endpoint}/v1/server-preview/env`, {
+              method: "POST",
+              headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+              body: JSON.stringify(envBody)
+            }, PREVIEW_REQUEST_TIMEOUT_MS2, "server preview env store");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!envRes.ok) {
             const err = await envRes.text();
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: HTTP ${envRes.status} ${err}` }, null, 2) }] };
@@ -981,11 +1200,16 @@ function register(api) {
         if (params.navigation_timeout) createBody.navigation_timeout = params.navigation_timeout;
         if (params.color_scheme) createBody.color_scheme = params.color_scheme;
         if (params.viewport) createBody.viewport = params.viewport;
-        const createRes = await fetch(`${endpoint}/v1/server-preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify(createBody)
-        });
+        let createRes;
+        try {
+          createRes = await fetchWithRetry2(`${endpoint}/v1/server-preview`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+            body: JSON.stringify(createBody)
+          }, PREVIEW_REQUEST_TIMEOUT_MS2, "server preview create");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: ${describeError2(e)}` }, null, 2) }] };
+        }
         if (!createRes.ok) {
           const err = await createRes.text();
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
@@ -995,37 +1219,56 @@ function register(api) {
         try {
           const excludes = params.exclude || [".git", "*.log"];
           const excludeArgs = excludes.flatMap((p) => ["--exclude", p]);
-          await execFile("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
-          const tarData = await (0, import_promises.readFile)(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
+          await execFile2("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
+          const tarData = await (0, import_promises2.readFile)(tarball);
+          let uploadRes;
+          try {
+            uploadRes = await fetchWithRetry2(created.upload_url, {
+              method: "PUT",
+              headers: { "Content-Type": "application/gzip" },
+              body: tarData
+            }, PREVIEW_UPLOAD_TIMEOUT_MS2, "server preview upload");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!uploadRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
           }
         } finally {
           try {
-            await (0, import_promises.rm)(tarball, { force: true });
+            await (0, import_promises2.rm)(tarball, { force: true });
           } catch {
           }
         }
-        const startRes = await fetch(`${endpoint}/v1/server-preview/${created.job_id}/start`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
+        let startRes;
+        try {
+          startRes = await fetchWithRetry2(`${endpoint}/v1/server-preview/${created.job_id}/start`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}` }
+          }, PREVIEW_REQUEST_TIMEOUT_MS2, "server preview start");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: ${describeError2(e)}` }, null, 2) }] };
+        }
         if (!startRes.ok) {
           const err = await startRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          if (isAlreadyStartedResponse(startRes.status, err)) {
+            console.warn(`[openclaw-riddledc] server preview start returned ${startRes.status} for ${created.job_id}; continuing to poll`);
+          } else {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          }
         }
         const timeoutMs = ((params.timeout || 120) + 60) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
         while (Date.now() - pollStart < timeoutMs) {
-          const statusRes = await fetch(`${endpoint}/v1/server-preview/${created.job_id}`, {
-            headers: { Authorization: `Bearer ${apiKey}` }
-          });
+          let statusRes;
+          try {
+            statusRes = await fetchWithRetry2(`${endpoint}/v1/server-preview/${created.job_id}`, {
+              headers: { Authorization: `Bearer ${apiKey}` }
+            }, PREVIEW_REQUEST_TIMEOUT_MS2, "server preview poll", { attempts: 2 });
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!statusRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
@@ -1044,7 +1287,7 @@ function register(api) {
             for (const output of result.outputs) {
               if (output.name && /\.(png|jpg|jpeg)$/i.test(output.name) && output.url) {
                 try {
-                  const imgRes = await fetch(output.url);
+                  const imgRes = await fetchWithTimeout2(output.url, {}, PREVIEW_ARTIFACT_TIMEOUT_MS, "server preview artifact download");
                   if (imgRes.ok) {
                     const buf = await imgRes.arrayBuffer();
                     const base64 = Buffer.from(buf).toString("base64");
@@ -1098,17 +1341,17 @@ function register(api) {
         if (!apiKey) {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
         }
-        assertAllowedBaseUrl(baseUrl);
+        assertAllowedBaseUrl2(baseUrl);
         const dir = params.directory;
         if (!dir || typeof dir !== "string") throw new Error("directory must be an absolute path");
         try {
-          const st = await (0, import_promises.stat)(dir);
+          const st = await (0, import_promises2.stat)(dir);
           if (!st.isDirectory()) throw new Error(`Not a directory: ${dir}`);
         } catch (e) {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Cannot access directory: ${e.message}` }, null, 2) }] };
         }
         try {
-          await (0, import_promises.stat)(`${dir}/Dockerfile`);
+          await (0, import_promises2.stat)(`${dir}/Dockerfile`);
         } catch {
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `No Dockerfile found at ${dir}/Dockerfile. riddle_build_preview requires a Dockerfile at the root of the directory.` }, null, 2) }] };
         }
@@ -1120,11 +1363,16 @@ function register(api) {
           const envBody = {};
           if (hasSensitiveEnv) envBody.env = params.sensitive_env;
           if (hasLocalStorage) envBody.localStorage = params.localStorage;
-          const envRes = await fetch(`${endpoint}/v1/build-preview/env`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-            body: JSON.stringify(envBody)
-          });
+          let envRes;
+          try {
+            envRes = await fetchWithTimeout2(`${endpoint}/v1/build-preview/env`, {
+              method: "POST",
+              headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+              body: JSON.stringify(envBody)
+            }, PREVIEW_REQUEST_TIMEOUT_MS2, "build preview env store");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!envRes.ok) {
             const err = await envRes.text();
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: HTTP ${envRes.status} ${err}` }, null, 2) }] };
@@ -1152,11 +1400,16 @@ function register(api) {
         if (params.color_scheme) createBody.color_scheme = params.color_scheme;
         if (params.viewport) createBody.viewport = params.viewport;
         if (params.audit) createBody.audit = true;
-        const createRes = await fetch(`${endpoint}/v1/build-preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify(createBody)
-        });
+        let createRes;
+        try {
+          createRes = await fetchWithRetry2(`${endpoint}/v1/build-preview`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+            body: JSON.stringify(createBody)
+          }, PREVIEW_REQUEST_TIMEOUT_MS2, "build preview create");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: ${describeError2(e)}` }, null, 2) }] };
+        }
         if (!createRes.ok) {
           const err = await createRes.text();
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
@@ -1166,37 +1419,56 @@ function register(api) {
         try {
           const excludes = params.exclude || [".git", "*.log"];
           const excludeArgs = excludes.flatMap((p) => ["--exclude", p]);
-          await execFile("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
-          const tarData = await (0, import_promises.readFile)(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
+          await execFile2("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
+          const tarData = await (0, import_promises2.readFile)(tarball);
+          let uploadRes;
+          try {
+            uploadRes = await fetchWithRetry2(created.upload_url, {
+              method: "PUT",
+              headers: { "Content-Type": "application/gzip" },
+              body: tarData
+            }, PREVIEW_UPLOAD_TIMEOUT_MS2, "build preview upload");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!uploadRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
           }
         } finally {
           try {
-            await (0, import_promises.rm)(tarball, { force: true });
+            await (0, import_promises2.rm)(tarball, { force: true });
           } catch {
           }
         }
-        const startRes = await fetch(`${endpoint}/v1/build-preview/${created.job_id}/start`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
+        let startRes;
+        try {
+          startRes = await fetchWithRetry2(`${endpoint}/v1/build-preview/${created.job_id}/start`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}` }
+          }, PREVIEW_REQUEST_TIMEOUT_MS2, "build preview start");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: ${describeError2(e)}` }, null, 2) }] };
+        }
         if (!startRes.ok) {
           const err = await startRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          if (isAlreadyStartedResponse(startRes.status, err)) {
+            console.warn(`[openclaw-riddledc] build preview start returned ${startRes.status} for ${created.job_id}; continuing to poll`);
+          } else {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          }
         }
         const timeoutMs = ((params.timeout || 180) + 120) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
         while (Date.now() - pollStart < timeoutMs) {
-          const statusRes = await fetch(`${endpoint}/v1/build-preview/${created.job_id}`, {
-            headers: { Authorization: `Bearer ${apiKey}` }
-          });
+          let statusRes;
+          try {
+            statusRes = await fetchWithRetry2(`${endpoint}/v1/build-preview/${created.job_id}`, {
+              headers: { Authorization: `Bearer ${apiKey}` }
+            }, PREVIEW_REQUEST_TIMEOUT_MS2, "build preview poll", { attempts: 2 });
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: ${describeError2(e)}` }, null, 2) }] };
+          }
           if (!statusRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
@@ -1219,7 +1491,7 @@ function register(api) {
             for (const output of result.outputs) {
               if (output.name && /\.(png|jpg|jpeg)$/i.test(output.name) && output.url) {
                 try {
-                  const imgRes = await fetch(output.url);
+                  const imgRes = await fetchWithTimeout2(output.url, {}, PREVIEW_ARTIFACT_TIMEOUT_MS, "build preview artifact download");
                   if (imgRes.ok) {
                     const buf = await imgRes.arrayBuffer();
                     const base64 = Buffer.from(buf).toString("base64");
@@ -1244,7 +1516,7 @@ function register(api) {
   async function riddleApiFetch(api2, method, path, body) {
     const { apiKey, baseUrl } = getCfg(api2);
     if (!apiKey) throw new Error("Missing Riddle API key. Set RIDDLE_API_KEY or configure in plugin settings.");
-    assertAllowedBaseUrl(baseUrl);
+    assertAllowedBaseUrl2(baseUrl);
     const url = `${baseUrl.replace(/\/$/, "")}${path}`;
     const res = await fetch(url, {
       method,
@@ -1312,7 +1584,7 @@ function register(api) {
       async execute(_id, params) {
         const { apiKey, baseUrl } = getCfg(api);
         if (!apiKey) return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
-        assertAllowedBaseUrl(baseUrl);
+        assertAllowedBaseUrl2(baseUrl);
         const payload = { timeout_sec: params.timeout_sec || 60 };
         if (params.stealth) payload.stealth = true;
         if (params.custom_storage) payload.custom_storage = params.custom_storage;