Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.
Python agent-orchestrationai-agentai-coding-assistantclaude-codecoding-agentcomputer-usedesktop-applocal-firstmcppersonal-jarvisvoice-assistantvoice-coding
feat(office): turn the lead office into an executive suite
rubenluetke10-beep3cd7cd9d4593
diff --git a/docs/agent-society/office-map.md b/docs/agent-society/office-map.mdindex 2369d00522..e3adce5f29 100644--- a/docs/agent-society/office-map.md+++ b/docs/agent-society/office-map.md@@ -117,6 +117,30 @@ target runs WebGL.- **Pace**: the person walks at 2.0 m/s and sprints at 4.4 m/s (Shift).Working agents stay at their screen even when called.+## 5c. Lead office as an executive suite (2026-09-29)++The lead office is the one room that breaks the plain toy-office palette on+purpose, so the boss's room reads as the most precious place on the floor+(`LeadSuite.tsx`, colours in `LEAD_SUITE`):++- **Shell:** dark walnut chevron floor, brass-framed walls with warm-tinted+ glass, a gold-on-black door sign.+- **Feature wall (north, 2.9 m):** walnut slats around a backlit black-glass+ star emblem, two lit bookcases with books, trophies and vases, warm LED coves.+- **Executive desk:** 2.4 m walnut desk with a brass edge, three monitors, a+ banker's lamp, a star plaque on the visitor side and a high-back oxblood+ leather chair. Seat distance and height match every other desk, so the+ seating and figure-pose contracts are unchanged. A second lead gets a+ partner desk; there is never an empty lead desk.+- **Furnishing:** navy rug with a gold border and medallion, two tan club+ armchairs for visitors, a bar cabinet and a chesterfield lounge with a glass+ coffee table along the west wall (fronts towards the camera), a floor globe,+ two floor lamps and palms. Two warm point lights make the room glow.+- Every piece stays inside its `FURNITURE_SIZE` footprint (props test) and the+ navigation tests still reach every seat, spot and checkpoint.++Awaiting the maintainer's visual review like the rest of the office.+## 6. Plan1. First map (done 2026-09-28).diff --git a/jarvis/ui/web/frontend/src/components/society/office/CheckpointMarker.tsx b/jarvis/ui/web/frontend/src/components/society/office/CheckpointMarker.tsxindex eff95492e6..365d611897 100644--- a/jarvis/ui/web/frontend/src/components/society/office/CheckpointMarker.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/CheckpointMarker.tsx@@ -13,7 +13,7 @@ import {} from "three";import { useT } from "@/i18n";import { plateScale } from "./OfficeAgents";-import { cachedCanvasTexture } from "./OfficeProps";+import { cachedCanvasTexture } from "./canvasMaterials";import type { Checkpoint } from "./officeLayout";import { CHECKPOINT_GOLD } from "./officePalette";diff --git a/jarvis/ui/web/frontend/src/components/society/office/LeadSuite.tsx b/jarvis/ui/web/frontend/src/components/society/office/LeadSuite.tsxnew file mode 100644index 0000000000..53712b431d--- /dev/null+++ b/jarvis/ui/web/frontend/src/components/society/office/LeadSuite.tsx@@ -0,0 +1,567 @@+/**+ * The lead office as an executive suite: a panelled walnut feature wall with+ * lit bookcases and a glowing star emblem, an executive desk with three+ * monitors and a high-back leather chair, club armchairs for visitors, a+ * chesterfield lounge, a bar, a floor globe and warm lamp light.+ *+ * Same rules as OfficeProps: every piece is built in local space centred on+ * the origin, front facing +z, inside its `FURNITURE_SIZE` box, from rounded+ * primitives; materials and canvas textures are module-level singletons.+ */+import { memo } from "react";+import {+ CylinderGeometry, DoubleSide, MeshStandardMaterial, OctahedronGeometry, SphereGeometry, TorusGeometry,+} from "three";+import type { SocietyAgent } from "../data";+import { canvasMaterial } from "./canvasMaterials";+import { Box, matte, MAT, Rounded, screenMaterial } from "./OfficeFurniture";+import { SEAT_OFFSET, type DeskSlot, type Furniture, type FurnitureKind, type Room } from "./officeLayout";+import { LEAD_SUITE as L } from "./officePalette";+import type { ScreenFace } from "./screenTextures";++type Vec3 = [number, number, number];++// ---------------------------------------------------------------------------+// Materials+// ---------------------------------------------------------------------------++export const LEAD_MAT = {+ walnut: matte(L.walnut, { roughness: 0.6 }),+ walnutDark: matte(L.walnutDark, { roughness: 0.65 }),+ walnutLight: matte(L.walnutLight, { roughness: 0.6 }),+ brass: matte(L.brass, { roughness: 0.32, metalness: 0.75 }),+ chrome: matte(L.chrome, { roughness: 0.25, metalness: 0.6 }),+ leather: matte(L.leather, { roughness: 0.55 }),+ leatherDark: matte(L.leatherDark, { roughness: 0.6 }),+ leatherTan: matte(L.leatherTan, { roughness: 0.55 }),+ velvet: matte(L.velvetGold, { roughness: 0.95 }),+ blackGlass: matte(L.blackGlass, { roughness: 0.15, metalness: 0.2 }),+ marble: matte(L.marble, { roughness: 0.3 }),+ led: new MeshStandardMaterial({ color: L.led, emissive: L.led, emissiveIntensity: 1.6, roughness: 0.5 }),+ backlight: new MeshStandardMaterial({ color: L.backlight, emissive: "#ffb45e", emissiveIntensity: 0.28, roughness: 0.8 }),+ shade: new MeshStandardMaterial({ color: L.shade, emissive: "#ffd89a", emissiveIntensity: 0.85, roughness: 0.9 }),+ lampGlass: new MeshStandardMaterial({ color: L.lampGlass, emissive: "#3fae6a", emissiveIntensity: 0.55, roughness: 0.3 }),+ glass: new MeshStandardMaterial({ color: L.glass, transparent: true, opacity: 0.35, roughness: 0.1, depthWrite: false }),+ wallGlass: new MeshStandardMaterial({ color: "#f3d9a4", transparent: true, opacity: 0.16, roughness: 0.1, side: DoubleSide, depthWrite: false }),+ mirror: new MeshStandardMaterial({ color: "#6b4a30", emissive: "#ffb766", emissiveIntensity: 0.35, roughness: 0.2, metalness: 0.4 }),+ trophy: matte(L.trophy, { roughness: 0.28, metalness: 0.8 }),+ bottles: L.bottles.map((c) => new MeshStandardMaterial({ color: c, roughness: 0.15, transparent: true, opacity: 0.85 })),+ globeLand: matte(L.globe.land),+ rugBorder: matte(L.rug.border, { roughness: 0.95 }),+};++const books = ["#7a2c22", "#1d2744", "#2f5a3f", "#c9a24a", "#e9e1d0", "#4a3a6a", "#8a5a36"].map((c) => matte(c));++const GEO = {+ cyl: new CylinderGeometry(1, 1, 1, 20),+ sphere: new SphereGeometry(1, 24, 16),+ star: new OctahedronGeometry(1, 0),+ ring: new TorusGeometry(1, 0.035, 8, 48),+};++function Cyl({ radius, height, position, material, rotation, cast = true }: {+ radius: number; height: number; position: Vec3; material: MeshStandardMaterial; rotation?: Vec3; cast?: boolean;+}) {+ return <mesh geometry={GEO.cyl} material={material} position={position} rotation={rotation} scale={[radius, height, radius]} castShadow={cast} receiveShadow />;+}++function Ball({ radius, position, material, cast = true }: { radius: number | Vec3; position: Vec3; material: MeshStandardMaterial; cast?: boolean }) {+ return <mesh geometry={GEO.sphere} material={material} position={position} scale={radius} castShadow={cast} receiveShadow />;+}++function Panel({ size, position, material, rotation }: { size: [number, number]; position: Vec3; material: MeshStandardMaterial; rotation?: Vec3 }) {+ return <mesh position={position} rotation={rotation} material={material}><planeGeometry args={size} /></mesh>;+}++// ---------------------------------------------------------------------------+// Canvas faces+// ---------------------------------------------------------------------------++function starPath(ctx: CanvasRenderingContext2D, cx: number, cy: number, outer: number, inner: number): void {+ ctx.beginPath();+ for (let i = 0; i < 10; i += 1) {+ const r = i % 2 === 0 ? outer : inner;+ const a = -Math.PI / 2 + (i * Math.PI) / 5;+ const x = cx + Math.cos(a) * r, y = cy + Math.sin(a) * r;+ if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);+ }+ ctx.closePath();+}++/** The feature wall's emblem: a gold star in two rings with fine rays on black glass. */+function drawEmblem(ctx: CanvasRenderingContext2D, w: number, h: number): void {+ const glow = ctx.createRadialGradient(w / 2, h / 2, 10, w / 2, h / 2, w * 0.55);+ glow.addColorStop(0, "#3a2a14");+ glow.addColorStop(1, "#0d0e12");+ ctx.fillStyle = glow;+ ctx.fillRect(0, 0, w, h);+ const cx = w / 2, cy = h / 2, r = h * 0.36;+ ctx.strokeStyle = "rgba(245,197,90,0.35)";+ ctx.lineWidth = 2;+ for (let i = 0; i < 48; i += 1) {+ const a = (i * Math.PI * 2) / 48;+ ctx.beginPath();+ ctx.moveTo(cx + Math.cos(a) * r * 1.22, cy + Math.sin(a) * r * 1.22);+ ctx.lineTo(cx + Math.cos(a) * r * (i % 2 === 0 ? 1.75 : 1.5), cy + Math.sin(a) * r * (i % 2 === 0 ? 1.75 : 1.5));+ ctx.stroke();+ }+ ctx.strokeStyle = "#f5c55a";+ ctx.lineWidth = 7;+ ctx.beginPath(); ctx.arc(cx, cy, r * 1.12, 0, Math.PI * 2); ctx.stroke();+ ctx.lineWidth = 3;+ ctx.beginPath(); ctx.arc(cx, cy, r * 0.98, 0, Math.PI * 2); ctx.stroke();+ const gold = ctx.createLinearGradient(cx - r, cy - r, cx + r, cy + r);+ gold.addColorStop(0, "#fff0b8");+ gold.addColorStop(0.5, "#f5c55a");+ gold.addColorStop(1, "#b8862a");+ ctx.fillStyle = gold;+ starPath(ctx, cx, cy + r * 0.04, r * 0.82, r * 0.34);+ ctx.fill();+}++/** Navy rug with a gold border, a burgundy band and a central medallion. */+function drawRug(ctx: CanvasRenderingContext2D, w: number, h: number): void {+ ctx.fillStyle = L.rug.field;+ ctx.fillRect(0, 0, w, h);+ const band = (inset: number, colour: string, width: number) => {+ ctx.strokeStyle = colour;+ ctx.lineWidth = width;+ ctx.strokeRect(inset, inset, w - inset * 2, h - inset * 2);+ };+ band(14, L.rug.border, 10);+ band(34, L.rug.accent, 14);+ band(52, L.rug.border, 3);+ ctx.fillStyle = L.rug.inner;+ ctx.fillRect(60, 60, w - 120, h - 120);+ // A lattice of small diamonds in the field.+ ctx.fillStyle = "rgba(201,162,74,0.22)";+ for (let y = 90; y < h - 80; y += 44) {+ for (let x = 90 + ((y / 44) % 2) * 22; x < w - 80; x += 44) {+ ctx.beginPath();+ ctx.moveTo(x, y - 6); ctx.lineTo(x + 6, y); ctx.lineTo(x, y + 6); ctx.lineTo(x - 6, y);+ ctx.fill();+ }+ }+ // Medallion.+ const cx = w / 2, cy = h / 2;+ ctx.fillStyle = L.rug.field;+ ctx.beginPath();+ ctx.moveTo(cx, cy - 120); ctx.lineTo(cx + 150, cy); ctx.lineTo(cx, cy + 120); ctx.lineTo(cx - 150, cy);+ ctx.closePath();+ ctx.fill();+ ctx.strokeStyle = L.rug.border;+ ctx.lineWidth = 5;+ ctx.stroke();+ ctx.fillStyle = L.rug.accent;+ ctx.beginPath(); ctx.arc(cx, cy, 44, 0, Math.PI * 2); ctx.fill();+ ctx.fillStyle = L.rug.border;+ starPath(ctx, cx, cy + 2, 32, 13);+ ctx.fill();+}++/** A vintage globe: teal seas, parchment continents, a few meridians. */+function drawGlobe(ctx: CanvasRenderingContext2D, w: number, h: number): void {+ ctx.fillStyle = L.globe.ocean;+ ctx.fillRect(0, 0, w, h);+ ctx.fillStyle = L.globe.land;+ const blobs: [number, number, number, number][] = [+ [0.2, 0.32, 0.1, 0.12], [0.26, 0.62, 0.06, 0.14], [0.5, 0.3, 0.07, 0.08], [0.53, 0.56, 0.07, 0.15],+ [0.68, 0.3, 0.14, 0.1], [0.83, 0.68, 0.06, 0.06], [0.15, 0.24, 0.05, 0.05], [0.72, 0.45, 0.05, 0.06],+ ];+ for (const [x, y, rx, ry] of blobs) {+ ctx.beginPath();+ ctx.ellipse(x * w, y * h, rx * w, ry * h, 0.3, 0, Math.PI * 2);+ ctx.fill();+ }+ ctx.strokeStyle = L.globe.line;+ ctx.globalAlpha = 0.35;+ ctx.lineWidth = 1.5;+ for (let i = 1; i < 12; i += 1) { ctx.beginPath(); ctx.moveTo((i * w) / 12, 0); ctx.lineTo((i * w) / 12, h); ctx.stroke(); }+ for (let i = 1; i < 6; i += 1) { ctx.beginPath(); ctx.moveTo(0, (i * h) / 6); ctx.lineTo(w, (i * h) / 6); ctx.stroke(); }+ ctx.globalAlpha = 1;+}++const faces = {+ emblem: () => canvasMaterial("lead:emblem", 512, 288, drawEmblem, { glow: 0.95, fallback: "#1a1510", roughness: 0.2 }),+ rug: () => canvasMaterial("lead:rug", 512, 512, drawRug, { fallback: L.rug.field, roughness: 0.95 }),+ globe: () => canvasMaterial("lead:globe", 256, 128, drawGlobe, { fallback: L.globe.ocean, roughness: 0.5 }),+};++// ---------------------------------------------------------------------------+// Feature wall+// ---------------------------------------------------------------------------++const WALL = { w: 7.9, h: 2.9, d: 0.38 } as const;+const CASE_W = 2.2;+const SHELF_YS = [0.62, 1.18, 1.74, 2.3] as const;++/** Shelf contents, deterministic per bookcase side: book runs, trophies, a vase, a framed photo. */+function shelfItems(side: number): { kind: "books" | "trophy" | "vase" | "frame"; x: number; shelf: number; n: number }[] {+ const out: { kind: "books" | "trophy" | "vase" | "frame"; x: number; shelf: number; n: number }[] = [];+ SHELF_YS.forEach((_, shelf) => {+ const seed = shelf * 3 + side * 7;+ out.push({ kind: "books", x: -0.8 + (seed % 3) * 0.08, shelf, n: 5 + (seed % 4) });+ const accent = (["trophy", "vase", "frame", "trophy"] as const)[(shelf + side) % 4];+ out.push({ kind: accent, x: 0.6 - (seed % 2) * 0.15, shelf, n: 0 });+ if (shelf % 2 === side % 2) out.push({ kind: "books", x: 0.05, shelf, n: 3 + (seed % 3) });+ });+ return out;+}++function ShelfItem({ item, y }: { item: ReturnType<typeof shelfItems>[number]; y: number }) {+ if (item.kind === "books") {+ return (+ <group position={[item.x, y, 0.02]}>+ {Array.from({ length: item.n }, (_, i) => {+ const h = 0.3 + ((i * 7 + item.n) % 4) * 0.035;+ return <Box key={i} size={[0.055, h, 0.2]} position={[i * 0.062, h / 2, 0]} material={books[(i + item.n) % books.length]} />;+ })}+ </group>+ );+ }+ if (item.kind === "trophy") {+ return (+ <group position={[item.x, y, 0.02]}>+ <Box size={[0.12, 0.05, 0.12]} position={[0, 0.025, 0]} material={LEAD_MAT.walnutDark} />+ <Cyl radius={0.015} height={0.1} position={[0, 0.1, 0]} material={LEAD_MAT.trophy} />+ <mesh geometry={GEO.cyl} material={LEAD_MAT.trophy} position={[0, 0.21, 0]} scale={[0.07, 0.13, 0.07]} castShadow />+ <mesh geometry={GEO.star} material={LEAD_MAT.trophy} position={[0, 0.33, 0]} scale={[0.04, 0.05, 0.02]} />+ </group>+ );+ }+ if (item.kind === "vase") {+ return (+ <group position={[item.x, y, 0.02]}>+ <Ball radius={[0.08, 0.12, 0.08]} position={[0, 0.12, 0]} material={LEAD_MAT.marble} />+ <Cyl radius={0.03} height={0.08} position={[0, 0.26, 0]} material={LEAD_MAT.marble} />+ </group>+ );+ }+ return (+ <group position={[item.x, y, 0.0]} rotation={[-0.12, 0, 0]}>+ <Box size={[0.26, 0.2, 0.02]} position={[0, 0.11, 0]} material={LEAD_MAT.brass} />+ <Box size={[0.22, 0.16, 0.012]} position={[0, 0.11, 0.008]} material={books[1]} cast={false} />+ </group>+ );+}++/** One built-in bookcase: walnut carcass, backlit panel, LED-lit shelves and a cabinet base. */+function Bookcase({ x, side }: { x: number; side: number }) {+ const items = shelfItems(side);+ return (+ <group position={[x, 0, 0]}>+ <Box size={[CASE_W - 0.1, WALL.h - 0.2, 0.02]} position={[0, (WALL.h - 0.2) / 2 + 0.05, -0.09]} material={LEAD_MAT.backlight} cast={false} />+ {[-CASE_W / 2 + 0.03, CASE_W / 2 - 0.03].map((px) => (+ <Box key={px} size={[0.06, WALL.h - 0.06, 0.34]} position={[px, (WALL.h - 0.06) / 2, 0.01]} material={LEAD_MAT.walnut} />+ ))}+ <Box size={[CASE_W, 0.07, 0.36]} position={[0, WALL.h - 0.04, 0.01]} material={LEAD_MAT.walnut} />+ {/* Cabinet base with two brass-handled doors. */}+ <Box size={[CASE_W - 0.12, 0.56, 0.32]} position={[0, 0.3, 0.02]} material={LEAD_MAT.walnutDark} />+ <Box size={[0.012, 0.5, 0.01]} position={[0, 0.3, 0.185]} material={LEAD_MAT.walnut} cast={false} />+ {[-0.08, 0.08].map((hx) => <Box key={hx} size={[0.02, 0.14, 0.02]} position={[hx, 0.36, 0.19]} material={LEAD_MAT.brass} cast={false} />)}+ {SHELF_YS.map((y) => (+ <group key={y}>+ <Box size={[CASE_W - 0.12, 0.04, 0.32]} position={[0, y, 0.02]} material={LEAD_MAT.walnut} />+ {/* Warm LED strip under the shelf's front edge. */}+ <Box size={[CASE_W - 0.2, 0.012, 0.02]} position={[0, y + 0.53, 0.15]} material={LEAD_MAT.led} cast={false} />+ </group>+ ))}+ {items.map((item, i) => <ShelfItem key={i} item={item} y={SHELF_YS[item.shelf] + 0.02} />)}+ </group>+ );+}++/** The north feature wall: walnut slats around a backlit star emblem, lit bookcases on both sides. */+function LeadWall() {+ const slats = 15;+ const centreW = WALL.w - CASE_W * 2 - 0.2;+ return (+ <group>+ <Box size={[WALL.w, WALL.h, 0.1]} position={[0, WALL.h / 2, -0.14]} material={LEAD_MAT.walnutDark} />+ {Array.from({ length: slats }, (_, i) => (+ <Box key={i} size={[0.07, WALL.h - 0.3, 0.04]} position={[-centreW / 2 + 0.1 + (i * (centreW - 0.2)) / (slats - 1), (WALL.h - 0.3) / 2 + 0.15, -0.07]}+ material={LEAD_MAT.walnutLight} />+ ))}+ {/* Emblem: black glass in a brass frame, lit from within. */}+ <Box size={[2.3, 1.3, 0.05]} position={[0, 1.62, -0.03]} material={LEAD_MAT.brass} />+ <Box size={[2.2, 1.2, 0.02]} position={[0, 1.62, 0.0]} material={LEAD_MAT.blackGlass} cast={false} />+ <Panel size={[2.14, 1.14]} position={[0, 1.62, 0.0115]} material={faces.emblem()} />+ {/* Cove lights top and bottom of the centre section. */}+ <Box size={[centreW, 0.03, 0.05]} position={[0, WALL.h - 0.1, -0.03]} material={LEAD_MAT.led} cast={false} />+ <Box size={[centreW, 0.03, 0.05]} position={[0, 0.12, -0.03]} material={LEAD_MAT.led} cast={false} />+ {/* Brass pilasters between the sections. */}+ {[-1, 1].map((s) => (+ <Box key={s} size={[0.08, WALL.h, 0.12]} position={[s * (centreW / 2 + 0.05), WALL.h / 2, -0.03]} material={LEAD_MAT.brass} />+ ))}+ <Bookcase x={-(WALL.w / 2 - CASE_W / 2)} side={0} />+ <Bookcase x={WALL.w / 2 - CASE_W / 2} side={1} />+ </group>+ );+}++// ---------------------------------------------------------------------------+// Seating and lounge+// ---------------------------------------------------------------------------++/** Tan leather club armchair for visitors, facing +z. */+function GuestChair() {+ return (+ <group>+ <Rounded size={[0.72, 0.3, 0.7]} radius={0.06} position={[0, 0.2, 0]} material={LEAD_MAT.leatherTan} />+ <Rounded size={[0.5, 0.1, 0.52]} radius={0.04} position={[0, 0.4, 0.06]} material={LEAD_MAT.leatherTan} />+ <Rounded size={[0.72, 0.5, 0.16]} radius={0.07} position={[0, 0.62, -0.27]} material={LEAD_MAT.leatherTan} />+ {[-0.29, 0.29].map((x) => <Rounded key={x} size={[0.14, 0.26, 0.68]} radius={0.06} position={[x, 0.46, 0]} material={LEAD_MAT.leatherTan} />)}+ {[[-0.3, -0.3], [0.3, -0.3], [-0.3, 0.3], [0.3, 0.3]].map(([x, z]) => (+ <Cyl key={`${x}${z}`} radius={0.025} height={0.05} position={[x, 0.025, z]} material={LEAD_MAT.brass} />+ ))}+ </group>+ );+}++/** Oxblood chesterfield with rolled arms, button tufting and two gold velvet cushions; faces +z. */+function Chesterfield() {+ const buttons: Vec3[] = [];+ for (let row = 0; row < 2; row += 1) {+ for (let i = 0; i < 8; i += 1) buttons.push([-0.8 + i * (1.6 / 7) + (row ? 0.11 : 0), 0.62 + row * 0.14, -0.255]);+ }+ return (+ <group>+ <Rounded size={[1.96, 0.34, 0.86]} radius={0.06} position={[0, 0.25, 0]} material={LEAD_MAT.leather} />+ {[-0.66, 0, 0.66].map((x) => <Rounded key={x} size={[0.64, 0.12, 0.66]} radius={0.05} position={[x, 0.48, 0.08]} material={LEAD_MAT.leather} />)}+ <Rounded size={[1.96, 0.44, 0.2]} radius={0.07} position={[0, 0.62, -0.36]} material={LEAD_MAT.leather} />+ {buttons.map((p, i) => <Ball key={i} radius={0.018} position={p} material={LEAD_MAT.leatherDark} cast={false} />)}+ {[-0.97, 0.97].map((x) => (+ <group key={x}>+ <Rounded size={[0.24, 0.46, 0.9]} radius={0.06} position={[x, 0.33, 0]} material={LEAD_MAT.leather} />+ <Cyl radius={0.12} height={0.9} position={[x, 0.6, 0]} rotation={[Math.PI / 2, 0, 0]} material={LEAD_MAT.leather} />+ </group>+ ))}+ {[-0.6, 0.6].map((x) => (+ <Rounded key={x} size={[0.36, 0.3, 0.1]} radius={0.04} position={[x, 0.66, -0.19]} material={LEAD_MAT.velvet} />+ ))}+ {[[-0.9, -0.35], [0.9, -0.35], [-0.9, 0.35], [0.9, 0.35]].map(([x, z]) => (+ <Box key={`${x}${z}`} size={[0.06, 0.08, 0.06]} position={[x, 0.04, z]} material={LEAD_MAT.brass} />+ ))}+ </group>+ );+}++/** Brass-framed glass coffee table with a marble shelf, a book stack and a vase. */+function LoungeTable() {+ return (+ <group>+ {[[-0.52, -0.29], [0.52, -0.29], [-0.52, 0.29], [0.52, 0.29]].map(([x, z]) => (+ <Box key={`${x}${z}`} size={[0.03, 0.42, 0.03]} position={[x, 0.21, z]} material={LEAD_MAT.brass} />+ ))}+ <Box size={[1.08, 0.025, 0.62]} position={[0, 0.42, 0]} material={LEAD_MAT.glass} cast={false} />+ <Box size={[1.06, 0.02, 0.6]} position={[0, 0.405, 0]} material={LEAD_MAT.brass} cast={false} />+ <Box size={[1.0, 0.03, 0.54]} position={[0, 0.12, 0]} material={LEAD_MAT.marble} />+ <Box size={[0.3, 0.04, 0.22]} position={[-0.22, 0.455, 0.02]} material={books[0]} />+ <Box size={[0.26, 0.035, 0.2]} position={[-0.22, 0.49, 0.02]} material={books[3]} />+ <Ball radius={[0.06, 0.09, 0.06]} position={[0.26, 0.52, -0.04]} material={LEAD_MAT.marble} />+ <Box size={[0.26, 0.05, 0.18]} position={[0.1, 0.16, 0]} material={books[1]} />+ </group>+ );+}++/** Tall brass floor lamp with a glowing drum shade. */+function FloorLamp() {+ return (+ <group>+ <Cyl radius={0.2} height={0.05} position={[0, 0.025, 0]} material={LEAD_MAT.walnutDark} />+ <Cyl radius={0.035} height={1.46} position={[0, 0.77, 0]} material={LEAD_MAT.walnutDark} />+ <Cyl radius={0.05} height={0.06} position={[0, 1.44, 0]} material={LEAD_MAT.brass} />+ <Cyl radius={0.21} height={0.3} position={[0, 1.6, 0]} material={LEAD_MAT.shade} cast={false} />+ </group>+ );+}++// ---------------------------------------------------------------------------+// Bar and globe+// ---------------------------------------------------------------------------++/** Walnut bar cabinet with a marble top, lit mirrored back, glass shelf and bottles; faces +z. */+function ExecutiveBar() {+ const bottles = [+ { x: -0.7, y: 0.94, h: 0.3 }, { x: -0.52, y: 0.94, h: 0.26 }, { x: -0.36, y: 0.94, h: 0.34 },+ { x: 0.42, y: 1.38, h: 0.24 }, { x: 0.58, y: 1.38, h: 0.28 }, { x: 0.74, y: 1.38, h: 0.22 },+ { x: -0.6, y: 1.38, h: 0.26 }, { x: -0.44, y: 1.38, h: 0.22 },+ ];+ return (+ <group>+ <Box size={[1.9, 0.86, 0.5]} position={[0, 0.45, 0]} material={LEAD_MAT.walnut} />+ <Box size={[1.9, 0.04, 0.52]} position={[0, 0.9, 0]} material={LEAD_MAT.marble} />+ {[-0.63, 0, 0.63].map((x) => (+ <group key={x}>+ <Box size={[0.58, 0.7, 0.012]} position={[x, 0.45, 0.253]} material={LEAD_MAT.walnutDark} cast={false} />+ <Box size={[0.14, 0.02, 0.02]} position={[x, 0.72, 0.262]} material={LEAD_MAT.brass} cast={false} />+ </group>+ ))}+ {[-0.92, 0.92].map((x) => <Box key={x} size={[0.06, 0.96, 0.3]} position={[x, 1.4, -0.1]} material={LEAD_MAT.walnut} />)}+ <Box size={[1.9, 0.06, 0.3]} position={[0, 1.87, -0.1]} material={LEAD_MAT.walnut} />+ <Box size={[1.78, 0.9, 0.02]} position={[0, 1.38, -0.24]} material={LEAD_MAT.mirror} cast={false} />+ <Box size={[1.78, 0.02, 0.24]} position={[0, 1.37, -0.12]} material={LEAD_MAT.glass} cast={false} />+ <Box size={[1.7, 0.012, 0.02]} position={[0, 1.82, -0.02]} material={LEAD_MAT.led} cast={false} />+ {bottles.map((b, i) => (+ <group key={i} position={[b.x, b.y, b.y > 1 ? -0.12 : 0.05]}>+ <Cyl radius={0.045} height={b.h * 0.7} position={[0, (b.h * 0.7) / 2, 0]} material={LEAD_MAT.bottles[i % LEAD_MAT.bottles.length]} />+ <Cyl radius={0.016} height={b.h * 0.3} position={[0, b.h * 0.85, 0]} material={LEAD_MAT.bottles[i % LEAD_MAT.bottles.length]} />+ </group>+ ))}+ {/* A decanter and two tumblers on the counter. */}+ <Ball radius={[0.1, 0.11, 0.1]} position={[0.35, 1.03, 0.06]} material={LEAD_MAT.bottles[0]} />+ <Cyl radius={0.02} height={0.08} position={[0.35, 1.17, 0.06]} material={LEAD_MAT.glass} />+ {[0.62, 0.76].map((x) => <Cyl key={x} radius={0.035} height={0.08} position={[x, 0.96, 0.1]} material={LEAD_MAT.glass} cast={false} />)}+ </group>+ );+}++/** Vintage floor globe on a walnut stand inside a tilted brass meridian. */+function Globe() {+ return (+ <group>+ <Cyl radius={0.3} height={0.05} position={[0, 0.025, 0]} material={LEAD_MAT.walnutDark} />+ <Cyl radius={0.035} height={0.4} position={[0, 0.25, 0]} material={LEAD_MAT.walnut} />+ <Cyl radius={0.14} height={0.04} position={[0, 0.44, 0]} material={LEAD_MAT.brass} />+ <group position={[0, 0.76, 0]} rotation={[0, 0, 0.41]}>+ <mesh geometry={GEO.sphere} material={faces.globe()} scale={0.28} castShadow receiveShadow />+ <mesh geometry={GEO.ring} material={LEAD_MAT.brass} scale={0.33} castShadow />+ </group>+ </group>+ );+}++/** Navy rug with a gold border and medallion, sized per instance. */+function ExecutiveRug({ w, d }: { w: number; d: number }) {+ return (+ <group>+ <Box size={[w, 0.016, d]} position={[0, 0.008, 0]} material={LEAD_MAT.rugBorder} cast={false} />+ <Panel size={[w - 0.08, d - 0.08]} position={[0, 0.018, 0]} rotation={[-Math.PI / 2, 0, 0]} material={faces.rug()} />+ </group>+ );+}++/** Renderers of the executive-suite furniture kinds; merged into OfficeProps' exhaustive table. */+export const LEAD_RENDERERS = {+ leadWall: () => <LeadWall />,+ executiveRug: ({ item }: { item: Furniture }) => <ExecutiveRug w={item.size?.w ?? 1} d={item.size?.d ?? 1} />,+ guestChair: () => <GuestChair />,+ chesterfield: () => <Chesterfield />,+ loungeTable: () => <LoungeTable />,+ executiveBar: () => <ExecutiveBar />,+ globe: () => <Globe />,+ floorLamp: () => <FloorLamp />,+} satisfies Partial<Record<FurnitureKind, (props: { item: Furniture }) => JSX.Element>>;++// ---------------------------------------------------------------------------+// Executive desk+// ---------------------------------------------------------------------------++/** High-back leather executive chair on a chrome five-star base; the seat top sits at 0.52 m like every chair. */+function ExecutiveChair() {+ return (+ <group>+ <Cyl radius={0.05} height={0.06} position={[0, 0.06, 0]} material={LEAD_MAT.chrome} />+ {Array.from({ length: 5 }, (_, i) => (+ <group key={i} rotation={[0, (i * Math.PI * 2) / 5, 0]}>+ <Box size={[0.04, 0.035, 0.3]} position={[0, 0.06, 0.15]} material={LEAD_MAT.chrome} />+ <Ball radius={0.03} position={[0, 0.03, 0.29]} material={MAT.chair} />+ </group>+ ))}+ <Cyl radius={0.028} height={0.34} position={[0, 0.26, 0]} material={LEAD_MAT.chrome} />+ <Rounded size={[0.6, 0.12, 0.56]} radius={0.05} position={[0, 0.46, 0]} material={LEAD_MAT.leather} />+ <Rounded size={[0.62, 0.84, 0.14]} radius={0.06} position={[0, 0.98, 0.3]} material={LEAD_MAT.leather} />+ <Rounded size={[0.46, 0.22, 0.14]} radius={0.06} position={[0, 1.5, 0.32]} material={LEAD_MAT.leather} />+ {[0.78, 0.98, 1.18].map((y) => <Box key={y} size={[0.5, 0.015, 0.01]} position={[0, y, 0.228]} material={LEAD_MAT.leatherDark} cast={false} />)}+ {[-0.33, 0.33].map((x) => (+ <group key={x}>+ <Box size={[0.04, 0.2, 0.04]} position={[x, 0.6, 0.02]} material={LEAD_MAT.chrome} />+ <Rounded size={[0.08, 0.05, 0.42]} radius={0.02} position={[x, 0.72, 0.02]} material={LEAD_MAT.leatherDark} />+ </group>+ ))}+ </group>+ );+}++/**+ * An executive desk in the same local frame as a bench desk: the agent sits at+ * +z and looks north (-z) at its monitors; the visitor side (-z) shows a+ * walnut modesty panel with the brass star. Wide desks get three monitors.+ */+function ExecutiveDesk({ w, d, face }: { w: number; d: number; face: ScreenFace }) {+ const pedestalX = w / 2 - 0.32;+ const triple = w >= 2.2;+ const screen = screenMaterial(face);+ return (+ <group>+ <Rounded size={[w, 0.07, d]} radius={0.02} position={[0, 0.735, 0]} material={LEAD_MAT.walnut} />+ <Box size={[w - 0.02, 0.025, d - 0.02]} position={[0, 0.69, 0]} material={LEAD_MAT.brass} />+ {[-pedestalX, pedestalX].map((x) => (+ <group key={x}>+ <Box size={[0.56, 0.68, d - 0.06]} position={[x, 0.34, 0]} material={LEAD_MAT.walnutDark} />+ {[0.16, 0.38, 0.58].map((y) => <Box key={y} size={[0.16, 0.02, 0.02]} position={[x, y, d / 2 - 0.02]} material={LEAD_MAT.brass} cast={false} />)}+ </group>+ ))}+ {/* Visitor side: modesty panel with brass inlays and the lit star plaque. */}+ <Box size={[w - 1.2, 0.56, 0.04]} position={[0, 0.4, -d / 2 + 0.05]} material={LEAD_MAT.walnutDark} />+ {[0.2, 0.6].map((y) => <Box key={y} size={[w - 1.2, 0.015, 0.01]} position={[0, y, -d / 2 + 0.025]} material={LEAD_MAT.brass} cast={false} />)}+ <Panel size={[0.44, 0.25]} position={[0, 0.4, -d / 2 + 0.028]} rotation={[0, Math.PI, 0]} material={faces.emblem()} />+ {/* Leather desk pad, keyboard, mouse. */}+ <Box size={[0.95, 0.006, 0.42]} position={[0, 0.773, 0.16]} material={LEAD_MAT.leatherDark} cast={false} />+ <Box size={[0.44, 0.02, 0.14]} position={[0, 0.785, 0.24]} material={MAT.keyboard} />+ <Rounded size={[0.06, 0.025, 0.1]} radius={0.01} position={[0.34, 0.785, 0.26]} material={MAT.keyboard} />+ {/* Monitors: a centre screen, and two angled wings on a wide desk. */}+ <Box size={[0.08, 0.2, 0.08]} position={[0, 0.87, -0.24]} material={MAT.monitor} />+ <Box size={[0.3, 0.02, 0.18]} position={[0, 0.78, -0.24]} material={MAT.monitor} />+ {[0, ...(triple ? [-1, 1] : [])].map((s) => (+ <group key={s} position={[s * 0.72, 1.2, -0.26 + Math.abs(s) * 0.1]} rotation={[0, -s * 0.42, 0]}>+ <Rounded size={[0.74, 0.44, 0.04]} radius={0.02} position={[0, 0, 0]} material={MAT.monitor} />+ <mesh position={[0, 0, 0.0215]} material={screen}><planeGeometry args={[0.68, 0.39]} /></mesh>+ </group>+ ))}+ {triple && [-0.72, 0.72].map((x) => <Box key={x} size={[0.05, 0.4, 0.05]} position={[x, 0.97, -0.18]} material={MAT.monitor} />)}+ {/* Banker's lamp, a trophy star and a coffee cup. */}+ <group position={[-w / 2 + 0.25, 0.77, -0.18]}>+ <Cyl radius={0.08} height={0.03} position={[0, 0.015, 0]} material={LEAD_MAT.brass} />+ <Cyl radius={0.012} height={0.3} position={[0, 0.16, 0]} material={LEAD_MAT.brass} />+ <Rounded size={[0.34, 0.08, 0.14]} radius={0.035} position={[0, 0.33, 0.04]} material={LEAD_MAT.lampGlass} cast={false} />+ </group>+ <group position={[w / 2 - 0.22, 0.77, -0.2]}>+ <Box size={[0.12, 0.06, 0.12]} position={[0, 0.03, 0]} material={LEAD_MAT.walnutDark} />+ <mesh geometry={GEO.star} material={LEAD_MAT.trophy} position={[0, 0.17, 0]} scale={[0.07, 0.1, 0.035]} castShadow />+ </group>+ <Cyl radius={0.04} height={0.09} position={[w / 2 - 0.35, 0.815, 0.22]} material={LEAD_MAT.marble} />+ <group position={[0, 0, SEAT_OFFSET]}><ExecutiveChair /></group>+ </group>+ );+}++/** Every lead desk (the ones that carry their own size) with the monitor face its agent's state calls for. */+export const ExecutiveDesks = memo(function ExecutiveDesks({ desks, agents }: { desks: DeskSlot[]; agents: ReadonlyMap<string, SocietyAgent> }) {+ return (+ <group>+ {desks.map((desk) => {+ const size = desk.size;+ if (!size) return null;+ const agent = desk.agentId ? agents.get(desk.agentId) : undefined;+ return (+ <group key={desk.id} position={[desk.x, 0, desk.z]} rotation={[0, desk.facing === "north" ? 0 : Math.PI, 0]} name={`desk:${desk.id}`}>+ <ExecutiveDesk w={size.w} d={size.d} face={agent ? agent.state : "empty"} />+ </group>+ );+ })}+ </group>+ );+});++/** Warm light pooled over the executive desk; the suite glows against the cooler open office. */+export function LeadOfficeLight({ room }: { room: Room }) {+ const cx = (room.minX + room.maxX) / 2;+ return (+ <group>+ <pointLight position={[cx, 2.7, room.minZ + 2.9]} color="#ffc98a" intensity={9} distance={7.5} decay={2} />+ <pointLight position={[room.minX + 0.4, 1.7, room.minZ + 3.1]} color="#ffd9a0" intensity={2.2} distance={3.2} decay={2} />+ <pointLight position={[room.maxX - 0.4, 1.7, room.minZ + 2.9]} color="#ffd9a0" intensity={2.2} distance={3.2} decay={2} />+ </group>+ );+}diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeProps.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeProps.tsxindex 39e186d400..e6c9cb1fc6 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeProps.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeProps.tsx@@ -9,70 +9,15 @@* canvas textures are module-level singletons shared by every copy.*/import { memo } from "react";-import {- CanvasTexture, CylinderGeometry, MeshStandardMaterial, SphereGeometry, SRGBColorSpace, type Texture,-} from "three";+import { CylinderGeometry, MeshStandardMaterial, SphereGeometry } from "three";+import { canvasMaterial } from "./canvasMaterials";+import { LEAD_RENDERERS } from "./LeadSuite";import { Bookshelf, Box, Couch, MAT, matte, Plant, Rounded, Rug } from "./OfficeFurniture";import { FURNITURE_SIZE, type Furniture, type FurnitureKind } from "./officeLayout";import { PROP_COLOURS as P } from "./officePalette";type Vec3 = [number, number, number];-// ----------------------------------------------------------------------------// Shared canvas textures-// -----------------------------------------------------------------------------const textureCache = new Map<string, Texture | null>();--/**- * A canvas-drawn texture, drawn once per key and cached. Returns null where no- * 2D canvas exists (SSR, tests without canvas); callers fall back to a colour.- */-export function cachedCanvasTexture(- key: string, width: number, height: number, draw: (ctx: CanvasRenderingContext2D, w: number, h: number) => void,-): Texture | null {- if (textureCache.has(key)) return textureCache.get(key) ?? null;- const canvas = typeof document !== "undefined" ? document.createElement("canvas") : null;- let ctx: CanvasRenderingContext2D | null = null;- try {- ctx = canvas?.getContext("2d") ?? null;- } catch {- // jsdom without the canvas package throws "not implemented": no texture, the colour fallback is correct.- ctx = null;- }- let texture: Texture | null = null;- if (canvas && ctx) {- canvas.width = width;- canvas.height = height;- draw(ctx, width, height);- const made = new CanvasTexture(canvas);- made.colorSpace = SRGBColorSpace;- made.anisotropy = 4;- texture = made;- }- textureCache.set(key, texture);- return texture;-}--const materialCache = new Map<string, MeshStandardMaterial>();--/** A material showing a cached canvas texture; `glow` > 0 makes it self-lit like a screen. */-function canvasMaterial(- key: string, width: number, height: number, draw: (ctx: CanvasRenderingContext2D, w: number, h: number) => void,- { glow = 0, fallback = "#ffffff", roughness = 0.6 }: { glow?: number; fallback?: string; roughness?: number } = {},-): MeshStandardMaterial {- let material = materialCache.get(key);- if (!material) {- const map = cachedCanvasTexture(key, width, height, draw);- material = new MeshStandardMaterial({- color: map ? "#ffffff" : fallback, map, roughness,- emissive: glow > 0 ? "#ffffff" : "#000000", emissiveMap: glow > 0 ? map : null, emissiveIntensity: glow,- });- materialCache.set(key, material);- }- return material;-}-function roundRect(ctx: CanvasRenderingContext2D, x: number, y: number, w: number, h: number, r: number): void {ctx.beginPath();ctx.moveTo(x + r, y);@@ -636,6 +581,7 @@ export const PROP_RENDERERS: Record<FurnitureKind, (props: { item: Furniture })return <RugPiece w={size.w} d={size.d} />;},elevator: () => <Elevator />,+ ...LEAD_RENDERERS,};/** One furniture item, placed at (x, 0, z) and turned by `rotationY` (0 = front faces +z). */diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsxindex 6011a93a33..4d255f2511 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx@@ -6,8 +6,9 @@import { useEffect, useMemo } from "react";import { MeshStandardMaterial, RepeatWrapping, type Texture } from "three";import { Box, MAT, Rounded } from "./OfficeFurniture";-import { cachedCanvasTexture } from "./OfficeProps";+import { cachedCanvasTexture } from "./canvasMaterials";import { ARCH, archPosts, type Door, type Room, type RoomKind, type WallSegment } from "./officeLayout";+import { LEAD_MAT } from "./LeadSuite";import { OFFICE, ROOM_FLOOR_COLOURS } from "./officePalette";// ---------------------------------------------------------------------------@@ -24,7 +25,7 @@ function lcg(seed: number): () => number {}/** Metres covered by one repeat of each floor pattern. */-const PATTERN_METRES: Record<RoomKind, number> = { lead: 3, team: 2, wardrobe: 2, reception: 2.4, break: 2 };+const PATTERN_METRES: Record<RoomKind, number> = { lead: 2.6, team: 2, wardrobe: 2, reception: 2.4, break: 2 };function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h: number): void {const { base, accents } = ROOM_FLOOR_COLOURS[kind];@@ -32,19 +33,27 @@ function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h:ctx.fillStyle = base;ctx.fillRect(0, 0, w, h);if (kind === "lead") {- // Warm planks, narrower and richer than the main floor.- const rows = 10, rowH = h / rows;- for (let row = 0; row < rows; row += 1) {- const offset = ((row * 71) % 128) - 128;- for (let seg = 0; seg < 4; seg += 1) {- ctx.fillStyle = accents[(row + seg) % accents.length];- ctx.fillRect(offset + seg * 128, row * rowH, 128, rowH);- ctx.fillStyle = "rgba(70,40,20,0.35)";- ctx.fillRect(offset + seg * 128, row * rowH, 2, rowH);+ // Dark walnut chevron: columns of slanted planks that alternate direction, so+ // the tile wraps seamlessly on both axes (64-px columns, 16-px planks).+ const col = 64, plank = 16, image = ctx.createImageData(w, h);+ const tones = accents.map((hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16)));+ for (let y = 0; y < h; y += 1) {+ for (let x = 0; x < w; x += 1) {+ const c = Math.floor(x / col), xm = x % col;+ const yy = (y + (c % 2 === 0 ? xm : col - xm)) % h;+ const index = Math.floor(yy / plank);+ const [r, g, b] = tones[(index * 7 + c * 3) % tones.length];+ // Seams between planks and along the chevron's spine, plus a faint grain.+ const seam = yy % plank < 1.2 || xm < 1 ? 0.62 : 1;+ const grain = 0.93 + 0.07 * Math.sin((yy * 0.9 + xm * 0.35 + index * 11) * 0.8);+ const o = (y * w + x) * 4;+ image.data[o] = r * seam * grain;+ image.data[o + 1] = g * seam * grain;+ image.data[o + 2] = b * seam * grain;+ image.data[o + 3] = 255;}- ctx.fillStyle = "rgba(70,40,20,0.3)";- ctx.fillRect(0, row * rowH, w, 2);}+ ctx.putImageData(image, 0, 0);} else if (kind === "team" || kind === "break") {// Carpet grain: fine speckles in the accent tones, plus a faint weave.for (let i = 0; i < 2600; i += 1) {@@ -109,7 +118,7 @@ function RoomFloor({ room }: { room: Room }) {);}-/** A floor overlay per room: wood (lead), teal carpet (team), lilac tile (wardrobe), stone (reception), coral carpet (break). */+/** A floor overlay per room: walnut chevron (lead), teal carpet (team), lilac tile (wardrobe), stone (reception), coral carpet (break). */export function RoomFloors({ rooms }: { rooms: Room[] }) {return <group>{rooms.map((room) => <RoomFloor key={room.id} room={room} />)}</group>;}@@ -124,19 +133,24 @@ const POST_SPACING = 1.5;/** One glass wall run: white base strip, glass pane, metal posts and a top rail. */function GlassWall({ wall }: { wall: WallSegment }) {+ // The lead office is framed in brass on a walnut base, behind warm-tinted glass.+ const lead = wall.room === "lead";+ const frame = lead ? LEAD_MAT.brass : MAT.railing;+ const base = lead ? LEAD_MAT.walnutDark : MAT.wall;+ const glass = lead ? LEAD_MAT.wallGlass : MAT.glass;const length = Math.hypot(wall.x2 - wall.x1, wall.z2 - wall.z1);if (length < 0.05) return null;const angle = Math.atan2(wall.z2 - wall.z1, wall.x2 - wall.x1);const posts = Math.max(2, Math.ceil(length / POST_SPACING) + 1);return (<group position={[(wall.x1 + wall.x2) / 2, 0, (wall.z1 + wall.z2) / 2]} rotation={[0, -angle, 0]}>- <Box size={[length, BASE_HEIGHT, 0.1]} position={[0, BASE_HEIGHT / 2, 0]} material={MAT.wall} />+ <Box size={[length, BASE_HEIGHT, 0.1]} position={[0, BASE_HEIGHT / 2, 0]} material={base} /><Box size={[length, WALL_HEIGHT - BASE_HEIGHT - 0.04, 0.02]} position={[0, (WALL_HEIGHT + BASE_HEIGHT - 0.04) / 2, 0]}- material={MAT.glass} cast={false} />- <Box size={[length, 0.05, 0.07]} position={[0, WALL_HEIGHT - 0.025, 0]} material={MAT.railing} />+ material={glass} cast={false} />+ <Box size={[length, 0.05, 0.07]} position={[0, WALL_HEIGHT - 0.025, 0]} material={frame} />{Array.from({ length: posts }, (_, i) => (<Box key={i} size={[0.05, WALL_HEIGHT, 0.07]} position={[-length / 2 + (length * i) / (posts - 1), WALL_HEIGHT / 2, 0]}- material={MAT.railing} />+ material={frame} />))}</group>);@@ -161,13 +175,20 @@ const SIGN_TEXT_W = 1.4;const SIGN_CANVAS = { w: 512, h: 112 } as const;const signMaterials = new Map<string, MeshStandardMaterial>();-function signMaterial(label: string): MeshStandardMaterial {- let material = signMaterials.get(label);+/** A sign face; the lead office's is gold lettering on black between two brass rules. */+function signMaterial(label: string, lead = false): MeshStandardMaterial {+ const key = `${lead ? "lead" : "room"}:${label}`;+ let material = signMaterials.get(key);if (!material) {- const map = cachedCanvasTexture(`room-sign:${label}`, SIGN_CANVAS.w, SIGN_CANVAS.h, (ctx, w, h) => {- ctx.fillStyle = OFFICE.signBoard;+ const map = cachedCanvasTexture(`room-sign:${key}`, SIGN_CANVAS.w, SIGN_CANVAS.h, (ctx, w, h) => {+ ctx.fillStyle = lead ? "#111217" : OFFICE.signBoard;ctx.fillRect(0, 0, w, h);- ctx.fillStyle = OFFICE.signText;+ if (lead) {+ ctx.fillStyle = "#d8ae52";+ ctx.fillRect(14, 10, w - 28, 3);+ ctx.fillRect(14, h - 13, w - 28, 3);+ }+ ctx.fillStyle = lead ? "#f5c55a" : OFFICE.signText;ctx.textAlign = "center";ctx.textBaseline = "middle";// Shrink long names (e.g. "Despacho del líder") to fit before cutting them off.@@ -183,19 +204,23 @@ function signMaterial(label: string): MeshStandardMaterial {while (text.length > 1 && ctx.measureText(text).width > room) text = text.slice(0, -1);ctx.fillText(text === label ? label : `${text.slice(0, -1).trimEnd()}…`, w / 2, h / 2 + 2);});- material = new MeshStandardMaterial({ color: map ? "#ffffff" : OFFICE.signBoard, map, roughness: 0.8 });- signMaterials.set(label, material);+ material = new MeshStandardMaterial({+ color: map ? "#ffffff" : OFFICE.signBoard, map, roughness: 0.8,+ // The lead's gold lettering glows faintly, like a lit plaque.+ ...(lead && map ? { emissive: "#ffffff", emissiveMap: map, emissiveIntensity: 0.35 } : {}),+ });+ signMaterials.set(key, material);}return material;}/** Dark-wood board with the label on both faces, centred on its local origin. */-function SignBoard({ label }: { label: string }) {- const material = signMaterial(label);+function SignBoard({ label, lead = false }: { label: string; lead?: boolean }) {+ const material = signMaterial(label, lead);const textH = (SIGN_TEXT_W * SIGN_CANVAS.h) / SIGN_CANVAS.w;return (<group>- <Rounded size={[SIGN_W, SIGN_H, 0.06]} radius={0.025} position={[0, 0, 0]} material={MAT.sign} />+ <Rounded size={[SIGN_W, SIGN_H, 0.06]} radius={0.025} position={[0, 0, 0]} material={lead ? LEAD_MAT.brass : MAT.sign} /><mesh position={[0, 0, 0.0305]} material={material}><planeGeometry args={[SIGN_TEXT_W, textH]} /></mesh><mesh position={[0, 0, -0.0305]} rotation={[0, Math.PI, 0]} material={material}><planeGeometry args={[SIGN_TEXT_W, textH]} /></mesh></group>@@ -223,8 +248,8 @@ export function RoomSign({ room, label }: { room: Room; label: string }) {const { x, z, rotationY } = doorAnchor(room, door);return (<group position={[x, 0, z]} rotation={[0, rotationY, 0]}>- <Box size={[door.width, 0.07, 0.07]} position={[0, WALL_HEIGHT - 0.035, 0]} material={MAT.railing} />- <group position={[0, WALL_HEIGHT + SIGN_H / 2 + 0.02, 0]}><SignBoard label={label} /></group>+ <Box size={[door.width, 0.07, 0.07]} position={[0, WALL_HEIGHT - 0.035, 0]} material={room.kind === "lead" ? LEAD_MAT.brass : MAT.railing} />+ <group position={[0, WALL_HEIGHT + SIGN_H / 2 + 0.02, 0]}><SignBoard label={label} lead={room.kind === "lead"} /></group></group>);}diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsxindex 54344ebd68..14b23b95fb 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx@@ -12,6 +12,7 @@ import type { SocietyAgent } from "../data";import type { ToyLook } from "./toyFigureModel";import { Railing, SignWall } from "./OfficeFurniture";import { DeskInstances } from "./DeskInstances";+import { ExecutiveDesks, LeadOfficeLight } from "./LeadSuite";import { LiveMonitors } from "./LiveMonitors";import type { DeskChat } from "./useDeskChats";import { FurniturePiece, MeetingChairs } from "./OfficeProps";@@ -128,6 +129,9 @@ export interface OfficeSceneProps {export function OfficeScene({ layout, grid, walkers, agents, newcomers, awake, reduced, overview, player, selection, nearby, chats, onOpenScreen }: OfficeSceneProps) {const t = useT();const desks = useMemo(() => allDesks(layout), [layout]);+ // Lead desks carry their own size and are built as executive desks, not bench instances.+ const benchDesks = useMemo(() => desks.filter((d) => !d.size), [desks]);+ const leadRoom = layout.rooms.find((r) => r.kind === "lead");const background = useMemo(() => new Color(OFFICE.space), []);const { minX, maxX, minZ, maxZ } = layout.bounds;const span = Math.max(maxX - minX, maxZ - minZ);@@ -155,7 +159,9 @@ export function OfficeScene({ layout, grid, walkers, agents, newcomers, awake, r<RoomWalls walls={layout.walls} />{layout.rooms.map((room) => <RoomSign key={room.id} room={room} label={t(`society.office.room_${room.kind}`)} />)}{layout.departments.map((dept) => <DepartmentArea key={dept.id} dept={dept} />)}- <DeskInstances desks={desks} agents={agents} />+ <DeskInstances desks={benchDesks} agents={agents} />+ <ExecutiveDesks desks={desks} agents={agents} />+ {leadRoom && <LeadOfficeLight room={leadRoom} />}<LiveMonitors desks={desks} agents={agents} chats={chats} onOpen={onOpenScreen} />{layout.furniture.map((item) => <FurniturePiece key={item.id} item={item} />)}{table && <MeetingChairs table={table} />}diff --git a/jarvis/ui/web/frontend/src/components/society/office/canvasMaterials.ts b/jarvis/ui/web/frontend/src/components/society/office/canvasMaterials.tsnew file mode 100644index 0000000000..1fbf7a88f2--- /dev/null+++ b/jarvis/ui/web/frontend/src/components/society/office/canvasMaterials.ts@@ -0,0 +1,56 @@+/**+ * Canvas-drawn textures and the materials that show them, drawn once per key+ * and shared by every prop, sign and floor that uses them.+ */+import { CanvasTexture, MeshStandardMaterial, SRGBColorSpace, type Texture } from "three";++const textureCache = new Map<string, Texture | null>();++/**+ * A canvas-drawn texture, drawn once per key and cached. Returns null where no+ * 2D canvas exists (SSR, tests without canvas); callers fall back to a colour.+ */+export function cachedCanvasTexture(+ key: string, width: number, height: number, draw: (ctx: CanvasRenderingContext2D, w: number, h: number) => void,+): Texture | null {+ if (textureCache.has(key)) return textureCache.get(key) ?? null;+ const canvas = typeof document !== "undefined" ? document.createElement("canvas") : null;+ let ctx: CanvasRenderingContext2D | null = null;+ try {+ ctx = canvas?.getContext("2d") ?? null;+ } catch {+ // jsdom without the canvas package throws "not implemented": no texture, the colour fallback is correct.+ ctx = null;+ }+ let texture: Texture | null = null;+ if (canvas && ctx) {+ canvas.width = width;+ canvas.height = height;+ draw(ctx, width, height);+ const made = new CanvasTexture(canvas);+ made.colorSpace = SRGBColorSpace;+ made.anisotropy = 4;+ texture = made;+ }+ textureCache.set(key, texture);+ return texture;+}++const materialCache = new Map<string, MeshStandardMaterial>();++/** A material showing a cached canvas texture; `glow` > 0 makes it self-lit like a screen. */+export function canvasMaterial(+ key: string, width: number, height: number, draw: (ctx: CanvasRenderingContext2D, w: number, h: number) => void,+ { glow = 0, fallback = "#ffffff", roughness = 0.6 }: { glow?: number; fallback?: string; roughness?: number } = {},+): MeshStandardMaterial {+ let material = materialCache.get(key);+ if (!material) {+ const map = cachedCanvasTexture(key, width, height, draw);+ material = new MeshStandardMaterial({+ color: map ? "#ffffff" : fallback, map, roughness,+ emissive: glow > 0 ? "#ffffff" : "#000000", emissiveMap: glow > 0 ? map : null, emissiveIntensity: glow,+ });+ materialCache.set(key, material);+ }+ return material;+}diff --git a/jarvis/ui/web/frontend/src/components/society/office/minimap.ts b/jarvis/ui/web/frontend/src/components/society/office/minimap.tsindex c93f74794a..8dd8d9be93 100644--- a/jarvis/ui/web/frontend/src/components/society/office/minimap.ts+++ b/jarvis/ui/web/frontend/src/components/society/office/minimap.ts@@ -12,7 +12,7 @@*/import { CHECKPOINT_GOLD, DEPARTMENT_TINTS, ROOM_FLOOR_COLOURS } from "./officePalette";import {- DESK_SIZE, FURNITURE_SIZE, allDesks, footprint, roomAt,+ FURNITURE_SIZE, allDesks, deskRect, footprint, roomAt,type CheckpointKind, type FurnitureKind, type OfficeLayout, type Point, type Rect, type RoomKind,} from "./officeLayout";@@ -313,6 +313,8 @@ const FURNITURE_PAINT: Partial<Record<FurnitureKind, string>> = {couch: "#4a5366", coffeeTable: "#c89f74", meetingTable: "#c89f74", teamBoard: "#f4f4f0", receptionDesk: "#f2eee6",kiosk: "#3a3f4b", lockers: "#5fa8a0", mirror: "#d6ecf8", coffeeBar: "#8a6240", waterCooler: "#6fb7ea", arcade: "#6a58b0",beanbag: "#e27d60", bookshelf: "#8a6240", plant: MAP_PAINT.plant, rug: MAP_PAINT.rug, elevator: "#c9ced6",+ leadWall: "#3a2416", executiveRug: "#26335a", guestChair: "#a9683c", chesterfield: "#7a2c22", loungeTable: "#d8ae52",+ executiveBar: "#5b3a25", globe: "#5f8f96", floorLamp: "#d8ae52",};export const STATE_RING: Record<MinimapAgentState, string> = {@@ -459,7 +461,7 @@ export function drawFloorArt(ctx: Ctx, layout: OfficeLayout, t: MapTransform, ar// Furniture: rugs first, then solid pieces; plants and beanbags are round.for (const pass of ["rug", "solid"] as const) {for (const item of layout.furniture) {- const isRug = item.kind === "rug";+ const isRug = item.kind === "rug" || item.kind === "executiveRug";if ((pass === "rug") !== isRug) continue;const colour = FURNITURE_PAINT[item.kind] ?? MAP_PAINT.furniture;const fp = footprint(item);@@ -481,10 +483,11 @@ export function drawFloorArt(ctx: Ctx, layout: OfficeLayout, t: MapTransform, ar}// Desks: tiny light blocks with the monitor on the far side from the chair.- const deskW = DESK_SIZE.w * t.scale;- const deskD = DESK_SIZE.d * t.scale;for (const desk of allDesks(layout)) {const c = worldToMap(t, desk);+ const rect = deskRect(desk);+ const deskW = (rect.maxX - rect.minX) * t.scale;+ const deskD = (rect.maxZ - rect.minZ) * t.scale;roundRectPath(ctx, c.x - deskW / 2, c.y - deskD / 2, deskW, deskD, Math.min(2, deskD * 0.2));ctx.fillStyle = MAP_PAINT.deskTop;ctx.fill();diff --git a/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts b/jarvis/ui/web/frontend/src/components/society/office/officeLayout.tsindex f703fbcffd..105838bf80 100644--- a/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts+++ b/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts@@ -35,6 +35,8 @@ export interface DeskSlot {/** The direction the seated agent looks (towards its monitor). */facing: Facing;agentId: string | null;+ /** The lead office's executive desk is larger than a bench desk; absent means DESK_SIZE. */+ size?: { w: number; d: number };}export interface Department extends Rect {@@ -68,7 +70,9 @@ export interface Checkpoint extends Point { id: CheckpointKind; room: RoomKind;export type FurnitureKind =| "meetingTable" | "teamBoard" | "receptionDesk" | "kiosk" | "lockers" | "mirror"| "coffeeBar" | "waterCooler" | "couch" | "coffeeTable" | "arcade" | "beanbag"- | "bookshelf" | "plant" | "rug" | "elevator";+ | "bookshelf" | "plant" | "rug" | "elevator"+ // Lead office: the executive suite.+ | "leadWall" | "executiveRug" | "guestChair" | "chesterfield" | "loungeTable" | "executiveBar" | "globe" | "floorLamp";/*** Footprint (x-extent × z-extent before rotation) and height of each piece.@@ -92,6 +96,15 @@ export const FURNITURE_SIZE: Record<FurnitureKind, { w: number; d: number; h: nuplant: { w: 0.6, d: 0.6, h: 1.3, solid: true },rug: { w: 1, d: 1, h: 0.02, solid: false },elevator: { w: 2.2, d: 0.4, h: 2.4, solid: true },+ leadWall: { w: 7.9, d: 0.38, h: 2.9, solid: true },+ executiveRug: { w: 1, d: 1, h: 0.02, solid: false },+ guestChair: { w: 0.74, d: 0.74, h: 0.92, solid: true },+ chesterfield: { w: 2.2, d: 0.95, h: 0.86, solid: true },+ loungeTable: { w: 1.1, d: 0.64, h: 0.62, solid: true },+ executiveBar: { w: 1.9, d: 0.52, h: 1.9, solid: true },+ // The tilted meridian ring reaches further east-west than the stand.+ globe: { w: 0.92, d: 0.72, h: 1.2, solid: true },+ floorLamp: { w: 0.46, d: 0.46, h: 1.8, solid: true },};export interface Furniture extends Point {@@ -100,7 +113,7 @@ export interface Furniture extends Point {/** Rotation about +y. 0 = the prop's front faces +z (south, towards the camera). */rotationY: number;room: RoomKind | "floor";- /** Only rugs are sized per instance (w × d); everything else uses FURNITURE_SIZE. */+ /** Only rugs (plain and executive) are sized per instance (w × d); everything else uses FURNITURE_SIZE. */size?: { w: number; d: number };}@@ -135,6 +148,10 @@ export const BENCH_DEPTH_Z = 4.2;/** Half the gap between the two monitors of a back-to-back pair. */export const DESK_HALF_GAP = 0.45;export const DESK_SIZE = { w: 1.5, d: 0.8 } as const;+/** The lead's executive desk: wider and a little deeper, same seat distance and height. */+export const EXECUTIVE_DESK_SIZE = { w: 2.4, d: 0.9 } as const;+/** A second lead's partner desk beside the executive desk. */+export const PARTNER_DESK_SIZE = { w: 1.7, d: 0.84 } as const;/** Chair centre behind a desk, along the agent's back direction. */export const SEAT_OFFSET = 0.62;export const DESKS_PER_ROW = 4;@@ -228,6 +245,12 @@ export function standOf(desk: Pick<DeskSlot, "x" | "z" | "facing">): Point & { freturn { x: seat.x + 0.55, z: seat.z, facing: seat.facing };}+/** The footprint of a desk top (bench desks share DESK_SIZE; lead desks carry their own). */+export function deskRect(desk: Pick<DeskSlot, "x" | "z" | "size">): Rect {+ const { w, d } = desk.size ?? DESK_SIZE;+ return { minX: desk.x - w / 2, maxX: desk.x + w / 2, minZ: desk.z - d / 2, maxZ: desk.z + d / 2 };+}+/** Axis-aligned footprint of a rotated piece (rotations are multiples of 90°). */export function footprint(item: Pick<Furniture, "x" | "z" | "kind" | "rotationY" | "size">): Rect {const base = item.size ?? FURNITURE_SIZE[item.kind];@@ -337,13 +360,17 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[]): OfficeLadoors: [{ side: "north", at: maxX - breakW / 2, width: 2.2 }, { side: "west", at: southMinZ + SOUTH_DEPTH / 2, width: 2 }] };const rooms = [leadRoom, teamRoom, wardrobeRoom, receptionRoom, breakRoom];- // Lead desks face south, towards the door and the office.+ // The lead's executive desk faces south, towards the door and the office. A+ // second lead gets a partner desk to its east; there is never an empty one.const leadAgents = agents.filter((a) => a.tier === "lead").sort(byArrival).slice(0, 2);+ const lx0 = leadRoom.minX, lz0 = leadRoom.minZ;+ const leadDeskZ = lz0 + 2.6;const lead = {minX: leadRoom.minX, maxX: leadRoom.maxX, minZ: leadRoom.minZ, maxZ: leadRoom.maxZ,- desks: [0, 1].map((i): DeskSlot => ({- id: `lead:${i}`, x: minX + leadW * (i === 0 ? 0.3 : 0.7), z: topZ + 2.6, facing: "south", agentId: leadAgents[i]?.agentId ?? null,- })),+ desks: [+ { id: "lead:0", x: lx0 + leadW / 2, z: leadDeskZ, facing: "south", agentId: leadAgents[0]?.agentId ?? null, size: EXECUTIVE_DESK_SIZE },+ ...(leadAgents[1] ? [{ id: "lead:1", x: lx0 + 6.75, z: leadDeskZ, facing: "south" as const, agentId: leadAgents[1].agentId, size: PARTNER_DESK_SIZE }] : []),+ ] satisfies DeskSlot[],};const tcx = (teamRoom.minX + teamRoom.maxX) / 2, tcz = (teamRoom.minZ + teamRoom.maxZ) / 2;@@ -351,9 +378,22 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[]): OfficeLaconst bx0 = breakRoom.minX, bz0 = breakRoom.minZ;const rx0 = receptionRoom.minX;const furniture: Furniture[] = [- // Lead office.- { id: "lead-shelf", kind: "bookshelf", x: leadRoom.maxX - 1.3, z: topZ + 0.35, rotationY: 0, room: "lead" },- { id: "lead-plant", kind: "plant", x: minX + 0.6, z: northMaxZ - 0.6, rotationY: 0, room: "lead" },+ // Lead office: a panelled feature wall with lit bookcases and the star emblem,+ // a rug under the executive desk, guest armchairs, the bar and a leather+ // lounge along the west wall (their fronts face the camera), a globe and a+ // lamp in the east, palms beside the door.+ { id: "lead-wall", kind: "leadWall", x: lx0 + leadW / 2, z: lz0 + 0.1 + FURNITURE_SIZE.leadWall.d / 2, rotationY: 0, room: "lead" },+ { id: "lead-rug", kind: "executiveRug", x: lx0 + leadW / 2, z: lz0 + 3.55, rotationY: 0, room: "lead", size: { w: 4.6, d: 3.9 } },+ { id: "lead-guest-w", kind: "guestChair", x: lx0 + leadW / 2 - 0.72, z: leadDeskZ + 1.2, rotationY: Math.PI, room: "lead" },+ { id: "lead-guest-e", kind: "guestChair", x: lx0 + leadW / 2 + 0.72, z: leadDeskZ + 1.2, rotationY: Math.PI, room: "lead" },+ { id: "lead-sofa", kind: "chesterfield", x: lx0 + 0.6, z: lz0 + 4.55, rotationY: Math.PI / 2, room: "lead" },+ { id: "lead-table", kind: "loungeTable", x: lx0 + 1.62, z: lz0 + 4.55, rotationY: Math.PI / 2, room: "lead" },+ { id: "lead-lamp", kind: "floorLamp", x: lx0 + 0.4, z: lz0 + 3.1, rotationY: 0, room: "lead" },+ { id: "lead-bar", kind: "executiveBar", x: lx0 + 0.36, z: lz0 + 1.85, rotationY: Math.PI / 2, room: "lead" },+ { id: "lead-globe", kind: "globe", x: leadRoom.maxX - 0.75, z: lz0 + 4.3, rotationY: 0, room: "lead" },+ { id: "lead-lamp-e", kind: "floorLamp", x: leadRoom.maxX - 0.34, z: lz0 + 2.9, rotationY: 0, room: "lead" },+ { id: "lead-plant", kind: "plant", x: lx0 + 0.55, z: northMaxZ - 0.55, rotationY: 0, room: "lead" },+ { id: "lead-plant-e", kind: "plant", x: leadRoom.maxX - 0.55, z: northMaxZ - 0.55, rotationY: 0, room: "lead" },// Team room: one long table, a board on the north wall.{ id: "team-table", kind: "meetingTable", x: tcx, z: tcz + 0.4, rotationY: 0, room: "team" },{ id: "team-board", kind: "teamBoard", x: tcx, z: topZ + 0.25, rotationY: 0, room: "team" },@@ -399,7 +439,8 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[]): OfficeLa{ id: "beanbag-a", kind: "beanbag", pose: "sit", x: bx0 + 7.2, z: bz0 + 5.4, facing: Math.PI * 1.25, room: "break" },{ id: "beanbag-b", kind: "beanbag", pose: "sit", x: bx0 + 8.4, z: bz0 + 6.3, facing: Math.PI * 1.25, room: "break" },{ id: "shelf-break", kind: "shelf", pose: "stand", x: bx0 + 2.2, z: bz0 + 1.1, facing: Math.PI, room: "break" },- { id: "shelf-lead", kind: "shelf", pose: "stand", x: leadRoom.maxX - 1.3, z: topZ + 1.2, facing: Math.PI, room: "lead" },+ // In front of the feature wall's east bookcase.+ { id: "shelf-lead", kind: "shelf", pose: "stand", x: leadRoom.maxX - 1.45, z: topZ + 1.05, facing: Math.PI, room: "lead" },{ id: "board", kind: "board", pose: "stand", x: tcx - 0.6, z: topZ + 1.2, facing: Math.PI, room: "team" },];// Meeting chairs: three per long side of the team table.@@ -434,7 +475,7 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[]): OfficeLaconst desks = [...lead.desks, ...departments.flatMap((d) => d.desks)];const obstacles: Rect[] = [...walls.map(wallRect),- ...desks.map((d) => ({ minX: d.x - DESK_SIZE.w / 2, maxX: d.x + DESK_SIZE.w / 2, minZ: d.z - DESK_SIZE.d / 2, maxZ: d.z + DESK_SIZE.d / 2 })),+ ...desks.map(deskRect),// Department sign walls along each department's north edge....departments.map((d) => ({ minX: d.minX + 0.2, maxX: d.maxX - 0.2, minZ: d.minZ + 0.02, maxZ: d.minZ + 0.2 })),...furniture.filter((f) => FURNITURE_SIZE[f.kind].solid).map(footprint),diff --git a/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts b/jarvis/ui/web/frontend/src/components/society/office/officePalette.tsindex caa5d78437..5ada3efc26 100644--- a/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts+++ b/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts@@ -71,7 +71,7 @@ export const PROP_COLOURS = {/** Floor overlays per room kind: base colour plus the pattern's accent tones. */export const ROOM_FLOOR_COLOURS = {- lead: { base: "#a9774d", accents: ["#b3825a", "#9e6d45", "#ad7b52", "#a47249"] },+ lead: { base: "#6a432a", accents: ["#74492d", "#5e3a24", "#6c4429", "#7d5133", "#553420"] },team: { base: "#7fb3ad", accents: ["#8bbdb7", "#74a7a1", "#86b8b2"] },wardrobe: { base: "#ddd3ea", accents: ["#cfc3e0", "#e6ddf1"] },reception: { base: "#e7e2d9", accents: ["#ece8e0", "#e0dacf", "#e9e4dc"] },@@ -80,3 +80,31 @@ export const ROOM_FLOOR_COLOURS = {/** Checkpoint gold: floor ring, hexagon token and the label badge. */export const CHECKPOINT_GOLD = { ring: "#f5b83d", rim: "#e0a02a", face: "#f7c65a", faceDeep: "#e39b1f", icon: "#ffffff" } as const;++/**+ * The lead office's executive suite: dark walnut, brass, oxblood leather and a+ * navy rug. Brass is the one deliberately metallic material outside the+ * railings, so the boss's room reads as the most precious place on the floor.+ */+export const LEAD_SUITE = {+ walnut: "#5b3a25",+ walnutDark: "#3a2416",+ walnutLight: "#80583a",+ brass: "#d8ae52",+ leather: "#7a2c22",+ leatherDark: "#4e1a14",+ leatherTan: "#a9683c",+ velvetGold: "#d9a441",+ chrome: "#c9ced6",+ blackGlass: "#12141a",+ marble: "#eeeae3",+ led: "#ffd08a",+ lampGlass: "#2f7a4f",+ shade: "#fff0d2",+ backlight: "#8a5a36",+ glass: "#e8d3a8",+ rug: { field: "#1d2744", inner: "#26335a", border: "#c9a24a", accent: "#8f2f3a" },+ globe: { ocean: "#5f8f96", land: "#e2cd98", line: "#3d5c61" },+ bottles: ["#b8661e", "#4f7a3a", "#d9e6ea", "#8c2a2a", "#c79a3a"],+ trophy: "#e8b949",+} as const;