ape-claw 0.1.3 → 0.1.5

package/src/server/routes/skills.mjs

@@ -3,6 +3,7 @@
  */
 
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import { ROOT as PROJECT_ROOT } from "../../lib/paths.mjs";
 import { getStorage } from "../storage/index.mjs";
@@ -21,6 +22,15 @@ function safeVersion(v) {
   return s;
 }
 
+function yamlSafe(v) {
+  const s = String(v || "");
+  if (!s) return "\"\"";
+  if (/[:{}\[\]#&*!|>'"%@`,\n]/.test(s) || s.startsWith(" ") || s.endsWith(" ")) {
+    return `"${s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+  }
+  return s;
+}
+
 function resolveHumanizerSlug(allSlugs) {
   const preferred = ["clawhub-humanizer", "clawhub-humanizer-2", "clawhub-afrexai-humanizer"];
   for (const s of preferred) {
@@ -103,13 +113,21 @@ function upsertUserSkill(store, auth, skillcard, sourceUrl, createdAt) {
 function installOpenClawSkillCard(skillcard, fallbackSlug = "") {
   const slugValue = toSlug(skillcard?.slug || fallbackSlug || skillcard?.name || "");
   if (!slugValue) throw new Error("invalid slug for OpenClaw install");
-  const skillDir = path.join(PROJECT_ROOT, ".cursor", "skills", slugValue);
+  const skillDir = path.join(os.homedir(), ".openclaw", "skills", slugValue);
   fs.mkdirSync(skillDir, { recursive: true });
   const doc = String(skillcard?.documentation_md || "").trim();
   const name = String(skillcard?.name || slugValue).trim();
   const version = String(skillcard?.version || "1.0.0").trim();
   const description = String(skillcard?.description || "").trim();
-  const content = doc || `---\nname: ${name}\nversion: ${version}\ndescription: ${description}\n---\n\n# ${name}\n\n${description}\n`;
+  if (Buffer.byteLength(doc, "utf8") > 300_000) throw new Error("documentation_md too large");
+  const frontmatter = `---\nname: ${slugValue}\nversion: ${yamlSafe(version)}\ndescription: ${yamlSafe(description.slice(0, 300))}\n---\n`;
+  let content;
+  if (doc) {
+    const stripped = doc.replace(/^---[\s\S]*?---\s*/, "").trim();
+    content = `${frontmatter}\n${stripped}\n`;
+  } else {
+    content = `${frontmatter}\n# ${name}\n\n${description}\n`;
+  }
   fs.writeFileSync(path.join(skillDir, "SKILL.md"), content, "utf8");
   return { slug: slugValue, skillDir };
 }
@@ -117,7 +135,7 @@ function installOpenClawSkillCard(skillcard, fallbackSlug = "") {
 function uninstallOpenClawSkillBySlug(slug) {
   const s = toSlug(slug || "");
   if (!s) return { removed: null, missing: null };
-  const skillDir = path.join(PROJECT_ROOT, ".cursor", "skills", s);
+  const skillDir = path.join(os.homedir(), ".openclaw", "skills", s);
   const skillMd = path.join(skillDir, "SKILL.md");
   if (!fs.existsSync(skillMd)) {
     return { removed: null, missing: { slug: s, reason: "SKILL.md not found" } };
@@ -137,7 +155,7 @@ export function handleSkillsSearch(req, res, reqUrl) {
     const sourceFilter = String(reqUrl.searchParams.get("source") || "").trim().toLowerCase();
     const vettedFilter = String(reqUrl.searchParams.get("vetted") || "").trim();
     const page = Math.max(1, Number(reqUrl.searchParams.get("page") || 1));
-    const limit = Math.min(5000, Math.max(1, Number(reqUrl.searchParams.get("limit") || 50)));
+    const limit = Math.min(15000, Math.max(1, Number(reqUrl.searchParams.get("limit") || 50)));
     let results = store.getMergedSkillIndex();
     if (sourceFilter && ["seed", "bundled", "imported", "user"].includes(sourceFilter)) results = results.filter((s) => s.source === sourceFilter);
     if (vettedFilter === "1") results = results.filter((s) => s.vettedOk === true);
@@ -152,8 +170,23 @@ export function handleSkillsSearch(req, res, reqUrl) {
     const total = results.length;
     const pages = Math.ceil(total / limit);
     const start = (page - 1) * limit;
-    res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
-    return res.end(JSON.stringify({ ok: true, total, page, limit, pages, results: results.slice(start, start + limit) }));
+    const paginatedResults = results.slice(start, start + limit);
+    const slim = reqUrl.searchParams.get("slim") === "1";
+    const payload = slim
+      ? paginatedResults.map((s) => ({
+          name: s.name, slug: s.slug, description: s.description,
+          riskTier: s.riskTier, source: s.source, vettedOk: s.vettedOk,
+          fileName: s.fileName || null,
+          onchainTokenId: s.onchainTokenId || null,
+          onchainMintTx: s.onchainMintTx || null,
+          onchainPublishTx: s.onchainPublishTx || null,
+        }))
+      : paginatedResults;
+    res.writeHead(200, {
+      "content-type": "application/json; charset=utf-8",
+      "cache-control": "public, max-age=120, s-maxage=300, stale-while-revalidate=600",
+    });
+    return res.end(JSON.stringify({ ok: true, total, page, limit, pages, results: payload }));
   } catch (err) {
     res.writeHead(500, { "content-type": "application/json; charset=utf-8" });
     return res.end(JSON.stringify({ ok: false, error: err.message || "search failed" }));

package/src/server/storage/file-backend.mjs

@@ -21,6 +21,7 @@ const SKILLCARDS_USER_INDEX_PATH = path.join(SKILLCARDS_USER_DIR, "index.json");
 const SKILLCARDS_SEED_DIR = path.join(PROJECT_ROOT, "skillcards", "seed");
 const SKILLCARDS_BUNDLED_DIR = path.join(PROJECT_ROOT, "data", "skills");
 const SKILLCARDS_IMPORTED_INDEX_PATH = path.join(PROJECT_ROOT, "skillcards", "imported", "index.json");
+const SKILLCARDS_SNAPSHOT_PATH = path.join(PROJECT_ROOT, "data", "skills-search.json");
 
 const MERGED_INDEX_CACHE_TTL_MS = 60_000;
 let mergedSkillIndexCache = { data: null, expiresAt: 0 };
@@ -146,6 +147,36 @@ function buildMergedSkillIndex() {
     }
   } catch { /* skip */ }
 
+  // If all live sources are empty, load from the pre-built snapshot so the
+  // API never returns 0 skills (covers deployment misconfigs, missing volumes, etc).
+  if (merged.length === 0) {
+    try {
+      if (fs.existsSync(SKILLCARDS_SNAPSHOT_PATH)) {
+        const snap = JSON.parse(fs.readFileSync(SKILLCARDS_SNAPSHOT_PATH, "utf8"));
+        const results = Array.isArray(snap?.results) ? snap.results : [];
+        for (const s of results) {
+          if (s && typeof s === "object" && (s.name || s.slug)) {
+            merged.push({
+              name: String(s.name || s.slug || "").trim(),
+              slug: String(s.slug || "").trim(),
+              description: String(s.description || "").trim(),
+              fileName: String(s.fileName || "").trim() || null,
+              source: String(s.source || "imported").trim(),
+              vettedOk: Boolean(s.vettedOk),
+              importOk: Boolean(s.importOk !== false),
+              riskTier: Number(s.riskTier ?? 2),
+              sourceUrl: String(s.sourceUrl || "").trim() || null,
+              provenance: s.provenance || { publisher: "snapshot", signed: false },
+              onchainTokenId: s.onchainTokenId || null,
+              onchainMintTx: s.onchainMintTx || null,
+              onchainPublishTx: s.onchainPublishTx || null,
+            });
+          }
+        }
+      }
+    } catch { /* snapshot unavailable */ }
+  }
+
   // Deduplicate by slug while preserving source precedence:
   // seed < imported < user (later entries override earlier ones).
   const bySlug = new Map();

package/src/telemetry-server.mjs

@@ -96,6 +96,7 @@ if (!fs.existsSync(SKILLCARDS_USER_INDEX_PATH)) {
 const SKILLCARDS_SEED_DIR = path.join(ROOT, "skillcards", "seed");
 const SKILLCARDS_BUNDLED_DIR = path.join(ROOT, "data", "skills");
 const SKILLCARDS_IMPORTED_INDEX_PATH = path.join(ROOT, "skillcards", "imported", "index.json");
+const SKILLCARDS_SNAPSHOT_PATH = path.join(ROOT, "data", "skills-search.json");
 
 // Cache for merged skill index (60 seconds TTL)
 let mergedSkillIndexCache = { data: null, expiresAt: 0 };
@@ -232,6 +233,37 @@ function buildMergedSkillIndex() {
     // Skip if user index doesn't exist or can't be read
   }
 
+  // If all live sources are empty, load from the pre-built snapshot so the
+  // API never returns 0 skills (covers path misconfigs, missing symlinks, etc).
+  if (merged.length === 0) {
+    try {
+      if (fs.existsSync(SKILLCARDS_SNAPSHOT_PATH)) {
+        const snap = JSON.parse(fs.readFileSync(SKILLCARDS_SNAPSHOT_PATH, "utf8"));
+        const results = Array.isArray(snap?.results) ? snap.results : [];
+        for (const s of results) {
+          if (s && typeof s === "object" && (s.name || s.slug)) {
+            merged.push({
+              name: String(s.name || s.slug || "").trim(),
+              slug: String(s.slug || "").trim(),
+              description: String(s.description || "").trim(),
+              fileName: String(s.fileName || "").trim() || null,
+              source: String(s.source || "imported").trim(),
+              vettedOk: Boolean(s.vettedOk),
+              importOk: Boolean(s.importOk !== false),
+              riskTier: Number(s.riskTier ?? 2),
+              sourceUrl: String(s.sourceUrl || "").trim() || null,
+              provenance: s.provenance || { publisher: "snapshot", signed: false },
+              onchainTokenId: s.onchainTokenId || null,
+              onchainMintTx: s.onchainMintTx || null,
+              onchainPublishTx: s.onchainPublishTx || null,
+            });
+          }
+        }
+        console.log(`[skills] Loaded ${merged.length} skills from snapshot fallback`);
+      }
+    } catch { /* snapshot unavailable */ }
+  }
+
   // Deduplicate by slug while preserving source precedence:
   // seed < imported < user (later entries override earlier ones).
   const bySlug = new Map();
@@ -840,7 +872,7 @@ const server = http.createServer((req, res) => {
       const sourceFilter = String(reqUrl.searchParams.get("source") || "").trim().toLowerCase();
       const vettedFilter = String(reqUrl.searchParams.get("vetted") || "").trim();
       const page = Math.max(1, Number(reqUrl.searchParams.get("page") || 1));
-      const limit = Math.min(5000, Math.max(1, Number(reqUrl.searchParams.get("limit") || 50)));
+      const limit = Math.min(15000, Math.max(1, Number(reqUrl.searchParams.get("limit") || 50)));
 
       let results = getMergedSkillIndex();
 
@@ -871,7 +903,22 @@ const server = http.createServer((req, res) => {
       const end = start + limit;
       const paginatedResults = results.slice(start, end);
 
-      res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+      const slim = reqUrl.searchParams.get("slim") === "1";
+      const payload = slim
+        ? paginatedResults.map((s) => ({
+            name: s.name, slug: s.slug, description: s.description,
+            riskTier: s.riskTier, source: s.source, vettedOk: s.vettedOk,
+            fileName: s.fileName || null,
+            onchainTokenId: s.onchainTokenId || null,
+            onchainMintTx: s.onchainMintTx || null,
+            onchainPublishTx: s.onchainPublishTx || null,
+          }))
+        : paginatedResults;
+
+      res.writeHead(200, {
+        "content-type": "application/json; charset=utf-8",
+        "cache-control": "public, max-age=120, s-maxage=300, stale-while-revalidate=600",
+      });
       return res.end(
         JSON.stringify({
           ok: true,
@@ -879,7 +926,7 @@ const server = http.createServer((req, res) => {
           page,
           limit,
           pages,
-          results: paginatedResults,
+          results: payload,
         }),
       );
     } catch (err) {
@@ -921,6 +968,42 @@ const server = http.createServer((req, res) => {
       return res.end(JSON.stringify({ ok: false, error: err.message || "get failed" }));
     }
   }
+  // Path-based skill lookup: /api/skills/<slug> (used by CLI and frontend)
+  if (pathname.startsWith("/api/skills/") && req.method === "GET" &&
+      pathname !== "/api/skills/search" && pathname !== "/api/skills/get" && pathname !== "/api/skills/stats") {
+    try {
+      const slug = decodeURIComponent(pathname.slice("/api/skills/".length)).trim();
+      if (!slug) {
+        res.writeHead(400, { "content-type": "application/json; charset=utf-8" });
+        return res.end(JSON.stringify({ ok: false, error: "missing slug" }));
+      }
+      const all = getMergedSkillIndex();
+      const match = all.find((s) => s.slug === slug);
+      if (!match) {
+        res.writeHead(404, { "content-type": "application/json; charset=utf-8" });
+        return res.end(JSON.stringify({ ok: false, error: "skill not found" }));
+      }
+      let fullCard = null;
+      const bucketDirs = {
+        seed: SKILLCARDS_SEED_DIR,
+        bundled: SKILLCARDS_BUNDLED_DIR,
+        imported: path.join(ROOT, "skillcards", "imported"),
+        user: SKILLCARDS_USER_DIR,
+      };
+      const baseDir = bucketDirs[match.source];
+      if (baseDir && match.fileName) {
+        try {
+          const fp = path.join(baseDir, match.fileName);
+          if (fs.existsSync(fp)) fullCard = JSON.parse(fs.readFileSync(fp, "utf8"));
+        } catch { /* index metadata is still returned below */ }
+      }
+      res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+      return res.end(JSON.stringify({ ok: true, skill: match, card: fullCard }));
+    } catch (err) {
+      res.writeHead(500, { "content-type": "application/json; charset=utf-8" });
+      return res.end(JSON.stringify({ ok: false, error: err.message || "get failed" }));
+    }
+  }
   if (pathname === "/api/skills/stats" && req.method === "GET") {
     try {
       const all = getMergedSkillIndex();
@@ -937,7 +1020,10 @@ const server = http.createServer((req, res) => {
         riskTier: s.riskTier, description: String(s.description || "").slice(0, 150),
         onchainTokenId: s.onchainTokenId ?? null,
       }));
-      res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+      res.writeHead(200, {
+        "content-type": "application/json; charset=utf-8",
+        "cache-control": "public, max-age=120, s-maxage=300, stale-while-revalidate=600",
+      });
       return res.end(JSON.stringify({ ok: true, total: all.length, seed, bundled, imported, user, vetted, onchain, recent }));
     } catch (err) {
       res.writeHead(500, { "content-type": "application/json; charset=utf-8" });

package/ui/forge/css/forge.css

@@ -39,7 +39,7 @@ a{color:var(--neon-cyan);text-decoration:none}
 
 /* ── Layout ─────────────────────────────────────────────── */
 .forge-app{
-  display:flex;flex-direction:column;min-height:100vh;position:relative;z-index:3;
+  display:flex;flex-direction:column;height:100vh;height:100dvh;position:relative;z-index:3;overflow:hidden;
 }
 
 /* ── Header ─────────────────────────────────────────────── */
@@ -63,7 +63,7 @@ a{color:var(--neon-cyan);text-decoration:none}
 
 /* ── Viewport ───────────────────────────────────────────── */
 .forge-viewport{
-  position:relative;flex:1;min-height:400px;background:#000;overflow:hidden;
+  position:relative;flex:1 1 0%;min-height:0;background:#000;overflow:hidden;
 }
 .forge-viewport canvas{display:block;width:100%;height:100%}
 #forgeLabelLayer{position:absolute;inset:0;pointer-events:none;overflow:hidden}
@@ -196,6 +196,19 @@ a{color:var(--neon-cyan);text-decoration:none}
 .forge-chat .chat-msg-name{font-size:.72rem;font-weight:700;color:var(--accent)}
 .forge-chat .chat-msg-time{font-family:var(--font-mono);font-size:.58rem;color:var(--dim);margin-left:auto}
 .forge-chat .chat-msg-text{font-size:.75rem;line-height:1.5;color:var(--text);word-break:break-word}
+.forge-chat .chat-msg-text strong{color:#eefad6;font-weight:700}
+.forge-chat .chat-msg-text code{
+  font-family:var(--font-mono);font-size:.68rem;
+  background:rgba(99,215,255,.08);border:1px solid rgba(99,215,255,.2);
+  color:#bce9ff;padding:1px 4px;border-radius:4px;
+}
+.forge-chat .chat-msg-text pre{
+  margin:6px 0;padding:8px;border-radius:6px;
+  background:rgba(0,0,0,.35);border:1px solid var(--border);
+  overflow-x:auto;
+}
+.forge-chat .chat-msg-text ul{margin:6px 0 6px 14px;padding:0}
+.forge-chat .chat-msg-text li{margin:2px 0}
 .forge-chat-input-bar{
   display:flex;gap:8px;padding:10px 12px;border-top:1px solid var(--border);
   background:linear-gradient(180deg,rgba(207,255,4,.02),transparent),var(--surface2);
@@ -441,6 +454,21 @@ a{color:var(--neon-cyan);text-decoration:none}
   border-radius:6px;padding:40px 36px;text-align:center;position:relative;
   box-shadow:0 0 80px rgba(207,255,4,.06),var(--panel-shadow);
 }
+.forge-offline-btn-agent{
+  background:linear-gradient(135deg,var(--accent),#a0d800);color:#0c0c0c;
+  font-size:.85rem;padding:11px 28px;border:none;cursor:pointer;
+  box-shadow:0 0 20px rgba(207,255,4,.25),0 0 40px rgba(207,255,4,.1);
+  animation:forge-agent-pulse 2s ease-in-out infinite;
+}
+.forge-offline-btn-agent:hover{
+  background:linear-gradient(135deg,#e2ff40,#cfff04);
+  box-shadow:0 0 28px rgba(207,255,4,.4),0 0 60px rgba(207,255,4,.15);
+  transform:translateY(-1px);
+}
+@keyframes forge-agent-pulse{
+  0%,100%{box-shadow:0 0 20px rgba(207,255,4,.25),0 0 40px rgba(207,255,4,.1)}
+  50%{box-shadow:0 0 28px rgba(207,255,4,.4),0 0 56px rgba(207,255,4,.18)}
+}
 .forge-offline-icon{font-size:3.5rem;margin-bottom:12px;filter:drop-shadow(0 0 18px rgba(207,255,4,.35))}
 .forge-offline-title{
   font-family:var(--font-display);font-weight:900;font-size:1.6rem;letter-spacing:.06em;

package/ui/forge/index.html

@@ -95,6 +95,7 @@
           <span class="icon">&#x1F4AC;</span> Agent Chat
           <span class="badge" id="forgeChatBadge">0</span>
         </div>
+        <div class="forge-chat-agent-indicator" id="forgeChatAgentIndicator" style="display:none;padding:4px 10px;font-size:11px;opacity:.7;font-family:'JetBrains Mono',monospace;">&#x1F99E; Talking to The Clawllector (OpenClaw agent)</div>
         <div class="forge-chat-messages" id="forgeChatMessages">
           <div class="chat-empty">
             <div class="chat-empty-icon">&#x1F4AC;</div>
@@ -102,8 +103,8 @@
           </div>
         </div>
         <div class="forge-chat-input-bar">
-          <input type="text" id="forgeChatInput" placeholder="Message your agent..." maxlength="500" disabled>
-          <button class="chat-send-btn" id="forgeChatSendBtn" type="button" disabled>Send</button>
+          <input type="text" id="forgeChatInput" placeholder="Message your agent..." maxlength="500">
+          <button class="chat-send-btn" id="forgeChatSendBtn" type="button">Send</button>
         </div>
         <div class="chat-input-meta">
           <span class="chat-counter" id="forgeChatCounter">0/500</span>
@@ -178,7 +179,7 @@
       <div class="forge-offline-divider"></div>
       <p class="forge-offline-desc">
         The Forge renders <strong>your</strong> installed skills as attachments on a 3D robot.
-        It discovers skills from your local Cursor &amp; OpenClaw directories, so it must be
+        It discovers skills from your local OpenClaw directories, so it must be
         hosted on your machine.
       </p>
       <div class="forge-offline-steps">
@@ -200,7 +201,7 @@
           <span class="forge-offline-step-num">3</span>
           <div>
             <strong>Open the Forge</strong>
-            <code>http://localhost:8799/forge</code>
+            <code>http://localhost:8787/forge</code>
             <span class="forge-offline-hint">Your installed skills appear as 3D attachments on the robot automatically</span>
           </div>
         </div>
@@ -208,9 +209,10 @@
       <div class="forge-offline-divider"></div>
       <p class="forge-offline-note">
         The Forge reads skills installed via <code>npx ape-claw skill install</code>.<br>
-        Skills are synced to <code>~/.cursor/skills/</code> and <code>~/.openclaw/workspace/skills/</code> automatically.
+        Skills are installed to <code>~/.openclaw/skills/</code> and synced to <code>~/.openclaw/workspace/skills/</code> automatically. <strong>Requires <a href="https://openclaw.ai" style="color:var(--accent)">OpenClaw</a>.</strong>
       </p>
       <div class="forge-offline-links">
+        <button class="forge-offline-btn forge-offline-btn-agent" id="forgeTryAgent" type="button">&#x1F99E; Try Our Agent</button>
         <a class="forge-offline-btn" href="/skills">Browse Skills</a>
         <a class="forge-offline-btn forge-offline-btn-secondary" href="https://github.com/simplefarmer69/ape-claw" target="_blank" rel="noopener">GitHub</a>
       </div>
@@ -221,12 +223,23 @@
   (async function detectLocal() {
     try {
       const r = await fetch("/api/health", { signal: AbortSignal.timeout(4000) });
-      if (r.ok) return; // local server running — load the forge normally
+      if (r.ok) return;
     } catch {}
-    // Not local — show the offline gate and hide the forge app
     document.getElementById("forgeOfflineGate").style.display = "";
     const app = document.querySelector(".forge-app");
     if (app) app.style.display = "none";
+
+    document.getElementById("forgeTryAgent").addEventListener("click", function() {
+      document.getElementById("forgeOfflineGate").style.display = "none";
+      if (app) app.style.display = "";
+      const chatInput = document.getElementById("forgeChatInput");
+      if (chatInput) {
+        chatInput.disabled = false;
+        chatInput.focus();
+      }
+      const chatBtn = document.getElementById("forgeChatSendBtn");
+      if (chatBtn) chatBtn.disabled = false;
+    });
   })();
   </script>
 

package/ui/forge/js/forge-attachments.js

@@ -7,6 +7,7 @@
  * floating disconnected in space.
  */
 import * as THREE from "three";
+import { RoundedBoxGeometry } from "three/addons/geometries/RoundedBoxGeometry.js";
 import { MAT } from "./forge-scene.js";
 
 /* ══════════════════════════════════════════════════════════
@@ -95,9 +96,12 @@ const RIVET_C = 0xd0d8e0;
 
 function armorPlate(mat, w, h, d) {
   const group = new THREE.Group();
-  const body = new THREE.Mesh(new THREE.BoxGeometry(w, h, d), mat);
+  const minDim = Math.min(w, h, d);
+  const bodyGeo = minDim > 0.08
+    ? new RoundedBoxGeometry(w, h, d, 2, minDim * 0.12)
+    : new THREE.BoxGeometry(w, h, d);
+  const body = new THREE.Mesh(bodyGeo, mat);
   group.add(body);
-  // Raised edge frame
   const frameMat = mat.clone();
   frameMat.color = new THREE.Color(FRAME_C);
   frameMat.emissiveIntensity = (frameMat.emissiveIntensity || 0) * 0.4;
@@ -106,14 +110,12 @@ function armorPlate(mat, w, h, d) {
   group.add(new THREE.Mesh(new THREE.BoxGeometry(w + bw * 2, bw, d + bw), frameMat).translateY(-h / 2));
   group.add(new THREE.Mesh(new THREE.BoxGeometry(bw, h, d + bw), frameMat).translateX(w / 2));
   group.add(new THREE.Mesh(new THREE.BoxGeometry(bw, h, d + bw), frameMat).translateX(-w / 2));
-  // Center glow line
   const glowMat = mat.clone();
   glowMat.emissiveIntensity = (glowMat.emissiveIntensity || 0.5) * 2.5;
   glowMat.transparent = true; glowMat.opacity = 0.7;
   group.add(new THREE.Mesh(new THREE.BoxGeometry(w * 0.6, 0.015, d * 0.3), glowMat).translateZ(d / 2 + 0.005));
-  // Mounting rivets
-  const rMat = new THREE.MeshStandardMaterial({ color: RIVET_C, metalness: 0.9, roughness: 0.15 });
-  const rGeo = new THREE.SphereGeometry(0.018, 5, 3);
+  const rMat = new THREE.MeshPhysicalMaterial({ color: RIVET_C, metalness: 0.95, roughness: 0.08, clearcoat: 1.0, clearcoatRoughness: 0.0 });
+  const rGeo = new THREE.SphereGeometry(0.018, 8, 6);
   for (const [rx, ry] of [[-1, -1], [1, -1], [-1, 1], [1, 1]]) {
     const rv = new THREE.Mesh(rGeo, rMat);
     rv.position.set(rx * w * 0.4, ry * h * 0.35, d / 2 + 0.01);
@@ -125,21 +127,18 @@ function armorPlate(mat, w, h, d) {
 function hexPlate(mat, r, h) {
   const group = new THREE.Group();
   group.add(new THREE.Mesh(new THREE.CylinderGeometry(r, r, h, 6), mat));
-  // Inner hex detail (recessed)
   const innerMat = mat.clone();
   innerMat.emissiveIntensity = (innerMat.emissiveIntensity || 0.5) * 1.8;
   innerMat.transparent = true; innerMat.opacity = 0.6;
   const inner = new THREE.Mesh(new THREE.CylinderGeometry(r * 0.55, r * 0.55, h + 0.01, 6), innerMat);
   group.add(inner);
-  // Center glow dot
   const dotMat = mat.clone();
   dotMat.emissiveIntensity = (dotMat.emissiveIntensity || 0.5) * 3;
-  group.add(new THREE.Mesh(new THREE.SphereGeometry(r * 0.18, 8, 6), dotMat).translateY(h / 2 + 0.01));
-  // Edge ring
+  group.add(new THREE.Mesh(new THREE.SphereGeometry(r * 0.18, 12, 8), dotMat).translateY(h / 2 + 0.01));
   const edgeMat = mat.clone();
   edgeMat.emissiveIntensity = (edgeMat.emissiveIntensity || 0.5) * 2;
   edgeMat.transparent = true; edgeMat.opacity = 0.5;
-  const edge = new THREE.Mesh(new THREE.TorusGeometry(r, r * 0.06, 6, 6), edgeMat);
+  const edge = new THREE.Mesh(new THREE.TorusGeometry(r, r * 0.06, 10, 6), edgeMat);
   edge.rotation.x = Math.PI / 2; edge.position.y = h / 2 + 0.005;
   group.add(edge);
   return group;
@@ -147,25 +146,21 @@ function hexPlate(mat, r, h) {
 
 function energyModule(mat, r) {
   const group = new THREE.Group();
-  const core = new THREE.Mesh(new THREE.OctahedronGeometry(r * 0.6), mat);
+  const core = new THREE.Mesh(new THREE.OctahedronGeometry(r * 0.6, 1), mat);
   group.add(core);
-  // Inner glow sphere
   const gMat = mat.clone();
   gMat.emissiveIntensity = (gMat.emissiveIntensity || 1) * 3;
   gMat.transparent = true; gMat.opacity = 0.5;
-  group.add(new THREE.Mesh(new THREE.SphereGeometry(r * 0.3, 10, 8), gMat));
-  // Primary ring
-  const ring = new THREE.Mesh(new THREE.TorusGeometry(r, r * 0.1, 8, 24), mat.clone());
+  group.add(new THREE.Mesh(new THREE.SphereGeometry(r * 0.3, 16, 12), gMat));
+  const ring = new THREE.Mesh(new THREE.TorusGeometry(r, r * 0.1, 12, 32), mat.clone());
   ring.material.transparent = true; ring.material.opacity = 0.6;
   ring.rotation.x = Math.PI / 2;
   group.add(ring);
-  // Secondary ring (orthogonal)
-  const ring2 = new THREE.Mesh(new THREE.TorusGeometry(r * 0.8, r * 0.06, 6, 18), mat.clone());
+  const ring2 = new THREE.Mesh(new THREE.TorusGeometry(r * 0.8, r * 0.06, 10, 24), mat.clone());
   ring2.material.transparent = true; ring2.material.opacity = 0.4;
   ring2.rotation.z = Math.PI / 2;
   group.add(ring2);
-  // Mounting bracket (small arm)
-  const bMat = new THREE.MeshStandardMaterial({ color: FRAME_C, metalness: 0.5, roughness: 0.5 });
+  const bMat = new THREE.MeshPhysicalMaterial({ color: FRAME_C, metalness: 0.6, roughness: 0.4, clearcoat: 0.3, clearcoatRoughness: 0.4 });
   group.add(new THREE.Mesh(new THREE.BoxGeometry(0.03, r * 1.2, 0.03), bMat).translateX(-r * 0.9));
   return group;
 }
@@ -195,24 +190,20 @@ function bladeFin(mat, h, w) {
     transparent: true, opacity: 0.6,
     blending: THREE.AdditiveBlending,
   })));
-  // Mount base
-  const bMat = new THREE.MeshStandardMaterial({ color: FRAME_C, metalness: 0.5, roughness: 0.5 });
-  group.add(new THREE.Mesh(new THREE.CylinderGeometry(0.025, 0.04, 0.06, 6), bMat).translateY(-h / 2 - 0.03));
+  const bMat = new THREE.MeshPhysicalMaterial({ color: FRAME_C, metalness: 0.6, roughness: 0.4, clearcoat: 0.3, clearcoatRoughness: 0.4 });
+  group.add(new THREE.Mesh(new THREE.CylinderGeometry(0.025, 0.04, 0.06, 8), bMat).translateY(-h / 2 - 0.03));
   return group;
 }
 
 function turretModule(mat, r) {
   const group = new THREE.Group();
-  // Barrel
-  const bMat = new THREE.MeshStandardMaterial({ color: FRAME_C, metalness: 0.6, roughness: 0.4 });
-  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 0.18, r * 0.22, r * 2.5, 8), bMat).rotateX(Math.PI / 2).translateY(r * 0.6));
-  // Mount base
-  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 0.6, r * 0.7, r * 0.4, 8), mat));
-  // Glow ring around base
+  const bMat = new THREE.MeshPhysicalMaterial({ color: FRAME_C, metalness: 0.7, roughness: 0.3, clearcoat: 0.4, clearcoatRoughness: 0.3 });
+  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 0.18, r * 0.22, r * 2.5, 12), bMat).rotateX(Math.PI / 2).translateY(r * 0.6));
+  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 0.6, r * 0.7, r * 0.4, 12), mat));
   const gMat = mat.clone();
   gMat.emissiveIntensity = (gMat.emissiveIntensity || 0.5) * 2.5;
   gMat.transparent = true; gMat.opacity = 0.5;
-  const ring = new THREE.Mesh(new THREE.TorusGeometry(r * 0.65, r * 0.06, 6, 16), gMat);
+  const ring = new THREE.Mesh(new THREE.TorusGeometry(r * 0.65, r * 0.06, 10, 24), gMat);
   ring.rotation.x = Math.PI / 2;
   group.add(ring);
   return group;
@@ -220,17 +211,14 @@ function turretModule(mat, r) {
 
 function sensorDome(mat, r) {
   const group = new THREE.Group();
-  group.add(new THREE.Mesh(new THREE.SphereGeometry(r, 12, 8, 0, Math.PI * 2, 0, Math.PI / 2), mat));
-  // Base ring
-  const bMat = new THREE.MeshStandardMaterial({ color: FRAME_C, metalness: 0.5, roughness: 0.5 });
-  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 1.1, r * 1.1, r * 0.15, 10), bMat));
-  // Antenna spike
-  group.add(new THREE.Mesh(new THREE.ConeGeometry(r * 0.08, r * 1.2, 5), mat.clone()).translateY(r * 0.9));
-  // Glow band
+  group.add(new THREE.Mesh(new THREE.SphereGeometry(r, 24, 16, 0, Math.PI * 2, 0, Math.PI / 2), mat));
+  const bMat = new THREE.MeshPhysicalMaterial({ color: FRAME_C, metalness: 0.6, roughness: 0.4, clearcoat: 0.3, clearcoatRoughness: 0.4 });
+  group.add(new THREE.Mesh(new THREE.CylinderGeometry(r * 1.1, r * 1.1, r * 0.15, 16), bMat));
+  group.add(new THREE.Mesh(new THREE.ConeGeometry(r * 0.08, r * 1.2, 8), mat.clone()).translateY(r * 0.9));
   const gMat = mat.clone();
   gMat.emissiveIntensity = (gMat.emissiveIntensity || 0.5) * 2.5;
   gMat.transparent = true; gMat.opacity = 0.5;
-  const ring = new THREE.Mesh(new THREE.TorusGeometry(r * 0.7, r * 0.04, 6, 16), gMat);
+  const ring = new THREE.Mesh(new THREE.TorusGeometry(r * 0.7, r * 0.04, 10, 24), gMat);
   ring.rotation.x = Math.PI / 2; ring.position.y = r * 0.3;
   group.add(ring);
   return group;