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
fix(office): restore the desk dressing mount and bench planter obstacles
rubenluetke10-beep0abc01de3290
diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsxindex db7148e7da..b3e0fc09cf 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx@@ -23,7 +23,6 @@ import { useEventStore } from "@/store/events";import type { DeskChat } from "./useDeskChats";import { FurniturePiece, MeetingChairs } from "./OfficeProps";import { TeamBoardFace } from "./TeamBoardFace";-import { TeamRoomFittings } from "./TeamRoomDecor";import { RoomFloors, RoomSign, RoomWalls } from "./OfficeRooms";import { CHECKPOINT_ICON, CheckpointMarker } from "./CheckpointMarker";import { ElevatorCallButton } from "./ElevatorCallButton";@@ -224,7 +223,6 @@ export function OfficeScene({ floor, occupants, ready, layout, grid, walkers, ag// Each desk takes its department's zone colour for the felt screen and the seat fabric.const zones = useMemo(() => new Map(layout.departments.flatMap((dept) => dept.desks.map((desk) => [desk.id, dept.tint] as const))), [layout]);const leadRoom = layout.rooms.find((r) => r.kind === "lead");- const teamRoom = layout.rooms.find((r) => r.kind === "team");const dogBeds = useMemo(() => layout.furniture.filter((f) => f.kind === "dogBed"), [layout]);const treatJar = layout.furniture.find((f) => f.kind === "treatJar") ?? null;const coding = floor === "coding";@@ -274,7 +272,6 @@ export function OfficeScene({ floor, occupants, ready, layout, grid, walkers, ag{layout.furniture.map((item) => <FurniturePiece key={item.id} item={item} />)}{table && <MeetingChairs table={table} />}{board && <TeamBoardFace board={board} enabled={floor === "agents"} />}- {teamRoom && table && <TeamRoomFittings room={teamRoom} table={table} />}{/* At the elevator its call button takes over from the floating token, which would hide it. */}{layout.checkpoints.filter((cp) => cp.id !== "elevator" || !atLift).map((cp) => (<CheckpointMarker key={cp.id} checkpoint={cp} label={t(`society.office.cp_${cp.id}`)} icon={CHECKPOINT_ICON[cp.id]}diff --git a/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts b/jarvis/ui/web/frontend/src/components/society/office/officeLayout.tsindex 7735847780..ca06a0f744 100644--- a/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts+++ b/jarvis/ui/web/frontend/src/components/society/office/officeLayout.ts@@ -104,11 +104,7 @@ export type FurnitureKind =| "dogBed" | "treatJar"// Coding floor: Mission Control's console ring.// Coding floor: Mission Control's slat wall with the video wall, and its desk with three monitors and a chair.- | "commandWall" | "commandDesk"- // Coding floor: the server room — rack rows round a cold aisle, the NOC console and status wall, UPS, fire suppression.- | "serverRack" | "coldAisle" | "nocConsole" | "statusWall" | "ups" | "fireSuppression"- // Team room: the slat wall behind the board, a credenza, fiddle-leaf figs and a wool rug.- | "teamWall" | "credenza" | "designerPlant" | "teamRug";+ | "commandWall" | "commandDesk";/*** Footprint (x-extent × z-extent before rotation) and height of each piece.@@ -116,8 +112,7 @@ export type FurnitureKind =* same numbers, so a prop larger than its footprint makes figures clip into it.*/export const FURNITURE_SIZE: Record<FurnitureKind, { w: number; d: number; h: number; solid: boolean }> = {- // The top is at 0.76 m; a carafe stands on it.- meetingTable: { w: 3.6, d: 1.6, h: 1.0, solid: true },+ meetingTable: { w: 3.6, d: 1.6, h: 0.76, solid: true },teamBoard: { w: 2.6, d: 0.2, h: 1.9, solid: true },// The counter is 1.1 m; its slatted back wall with the help display rises to 2.2 m.receptionDesk: { w: 2.8, d: 0.9, h: 2.2, solid: true },@@ -149,20 +144,6 @@ export const FURNITURE_SIZE: Record<FurnitureKind, { w: number; d: number; h: nucommandWall: { w: 7.8, d: 0.3, h: 2.7, solid: true },// Desk and chair together; not a solid box, navigation walks round commandDeskObstacles.commandDesk: { w: 2.8, d: 2.1, h: 1.45, solid: false },- // Server room: a row of five 42U racks, its ladder tray on top; the aisle between two rows (floor tiles,- // overhead trays, a light) is walkable; the NOC console includes its stool.- serverRack: { w: 3.0, d: 1.0, h: 2.3, solid: true },- coldAisle: { w: 2.44, d: 3.0, h: 2.3, solid: false },- nocConsole: { w: 2.0, d: 1.3, h: 1.3, solid: true },- statusWall: { w: 2.4, d: 0.3, h: 2.1, solid: true },- ups: { w: 1.2, d: 0.8, h: 1.9, solid: true },- fireSuppression: { w: 0.9, d: 0.5, h: 1.9, solid: true },- // Team room: the slat wall carries the board, felt panels and the video display.- teamWall: { w: 8.16, d: 0.12, h: 2.05, solid: true },- // The body is 0.61 m; books and a vase of branches stand on it.- credenza: { w: 2.2, d: 0.46, h: 1.1, solid: true },- designerPlant: { w: 0.8, d: 0.8, h: 2.0, solid: true },- teamRug: { w: 1, d: 1, h: 0.02, solid: false },};export interface Furniture extends Point {@@ -171,7 +152,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 (plain, executive and the team rug) 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 };}@@ -564,36 +545,21 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[], options:{ id: "command-plant-s", kind: "plant", x: leadRoom.maxX - 0.55, z: northMaxZ - 0.55, rotationY: 0, room: "command" },] : [];const wx0 = wardrobeRoom.minX;- // Server room: the rack rows' centre line and the cold aisle between their fronts.- const serverRowZ = topZ + 3.5;- const serverAisleMinX = wx0 + 0.06 + FURNITURE_SIZE.serverRack.d;- const serverAisleMaxX = wardrobeRoom.maxX - 0.06 - FURNITURE_SIZE.serverRack.d;const furniture: Furniture[] = [...leadFurniture,...commandFurniture,- // Team room: a walnut table on a wool rug, the board on a slat wall with- // felt panels and a video display, a credenza under the display and one- // along the west wall, fiddle-leaf figs in both corners by the door.- { id: "team-rug", kind: "teamRug", x: tcx, z: tcz + 0.4, rotationY: 0, room: "team", size: { w: 5.4, d: 4.0 } },+ // 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-wall", kind: "teamWall", x: tcx, z: topZ + 0.06 + FURNITURE_SIZE.teamWall.d / 2, rotationY: 0, room: "team" },{ id: "team-board", kind: "teamBoard", x: tcx, z: topZ + 0.25, rotationY: 0, room: "team" },- { id: "team-credenza", kind: "credenza", x: tcx + 2.7, z: topZ + 0.19 + FURNITURE_SIZE.credenza.d / 2, rotationY: 0, room: "team" },- { id: "team-credenza-w", kind: "credenza", x: teamRoom.minX + 0.07 + FURNITURE_SIZE.credenza.d / 2, z: tcz + 0.4, rotationY: Math.PI / 2, room: "team" },- { id: "team-plant", kind: "designerPlant", x: teamRoom.maxX - 0.6, z: northMaxZ - 0.6, rotationY: 0, room: "team" },- { id: "team-plant-w", kind: "designerPlant", x: teamRoom.minX + 0.6, z: northMaxZ - 0.6, rotationY: Math.PI / 2, room: "team" },+ { id: "team-plant", kind: "plant", x: teamRoom.maxX - 0.6, z: northMaxZ - 0.6, rotationY: 0, room: "team" },...(coding ? [- // Coding floor, east: a server room — two rack rows back to the side walls,- // fronts facing across a cold aisle that runs from the door to the NOC- // console and the status wall on the north side; the UPS and the- // fire-suppression bank stand in the corners by the door.- { id: "server-status", kind: "statusWall", x: wcx, z: topZ + 0.08 + FURNITURE_SIZE.statusWall.d / 2, rotationY: 0, room: "server" },- { id: "server-noc", kind: "nocConsole", x: wcx, z: topZ + 0.5 + FURNITURE_SIZE.nocConsole.d / 2, rotationY: 0, room: "server" },- { id: "server-rack-w", kind: "serverRack", x: wx0 + 0.06 + FURNITURE_SIZE.serverRack.d / 2, z: serverRowZ, rotationY: Math.PI / 2, room: "server" },- { id: "server-rack-e", kind: "serverRack", x: wardrobeRoom.maxX - 0.06 - FURNITURE_SIZE.serverRack.d / 2, z: serverRowZ, rotationY: -Math.PI / 2, room: "server" },- { id: "server-aisle", kind: "coldAisle", x: wcx, z: serverRowZ, rotationY: 0, room: "server" },- { id: "server-ups", kind: "ups", x: wx0 + 0.06 + FURNITURE_SIZE.ups.d / 2, z: topZ + 6.0, rotationY: Math.PI / 2, room: "server" },- { id: "server-fire", kind: "fireSuppression", x: wardrobeRoom.maxX - 0.06 - FURNITURE_SIZE.fireSuppression.d / 2, z: topZ + 6.0, rotationY: -Math.PI / 2, room: "server" },+ // Coding floor, east: a server room — a rack cabinet on the north wall and+ // console terminals along both side walls.+ { id: "server-rack", kind: "lockers", x: wcx, z: topZ + 0.4, rotationY: 0, room: "server" },+ { id: "server-console-e1", kind: "kiosk", x: wardrobeRoom.maxX - 0.35, z: topZ + 2.2, rotationY: -Math.PI / 2, room: "server" },+ { id: "server-console-e2", kind: "kiosk", x: wardrobeRoom.maxX - 0.35, z: topZ + 3.7, rotationY: -Math.PI / 2, room: "server" },+ { id: "server-console-w", kind: "kiosk", x: wx0 + 0.35, z: topZ + 2.2, rotationY: Math.PI / 2, room: "server" },+ { id: "server-plant", kind: "plant", x: wx0 + 0.55, z: northMaxZ - 0.55, rotationY: 0, room: "server" },] satisfies Furniture[] : [// Wardrobe: lockers and a mirror.{ id: "wardrobe-lockers", kind: "lockers", x: wcx - 0.2, z: topZ + 0.4, rotationY: 0, room: "wardrobe" },@@ -642,9 +608,9 @@ export function buildOfficeLayout(agents: readonly OfficeAgentInput[], options:{ id: "couch-command-1", kind: "couch", pose: "sit", x: lx0 + 0.75, z: lz0 + 4.55, facing: Math.PI / 2, room: "command" },{ id: "couch-command-2", kind: "couch", pose: "sit", x: lx0 + 0.75, z: lz0 + 5.65, facing: Math.PI / 2, room: "command" },{ id: "shelf-command", kind: "shelf", pose: "stand", x: leadRoom.maxX - 1.1, z: lz0 + 4.7, facing: Math.PI / 2, room: "command" },- // Server room: in the cold aisle, each looking at a rack row's glass fronts.- { id: "console-e", kind: "board", pose: "stand", x: serverAisleMaxX - 0.55, z: serverRowZ, facing: Math.PI / 2, room: "server" },- { id: "console-w", kind: "board", pose: "stand", x: serverAisleMinX + 0.55, z: serverRowZ, facing: -Math.PI / 2, room: "server" },+ // Server room: a look at the consoles on either wall.+ { id: "console-e", kind: "board", pose: "stand", x: wardrobeRoom.maxX - 1.2, z: topZ + 2.2, facing: Math.PI / 2, room: "server" },+ { id: "console-w", kind: "board", pose: "stand", x: wx0 + 1.2, z: topZ + 2.2, facing: -Math.PI / 2, room: "server" },] satisfies Spot[] : [// 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" },