web/src/components/layout/AppShell.tsx

@@ -1,4 +1,5 @@
 import { Link, Outlet, useNavigate } from '@tanstack/react-router'
+import { Toaster } from '@/components/ui/toast'
 import { useLogout, useMe } from '@/lib/auth'
 
 const navLinks = [
@@ -81,6 +82,8 @@ export function AppShell() {
       <main className="mx-auto w-full max-w-5xl flex-1 px-4 py-6">
         <Outlet />
       </main>
+
+      <Toaster />
     </div>
   )
 }

web/src/components/ui/toast.tsx

@@ -0,0 +1,64 @@
+import { useEffect } from 'react'
+import { create } from 'zustand'
+import { cn } from '@/lib/cn'
+
+type ToastTone = 'info' | 'error'
+interface Toast {
+  id: number
+  message: string
+  tone: ToastTone
+}
+
+interface ToastState {
+  toasts: Toast[]
+  push: (message: string, tone?: ToastTone) => void
+  dismiss: (id: number) => void
+}
+
+let nextId = 1
+
+export const useToastStore = create<ToastState>((set) => ({
+  toasts: [],
+  push: (message, tone = 'info') => set((s) => ({ toasts: [...s.toasts, { id: nextId++, message, tone }] })),
+  dismiss: (id) => set((s) => ({ toasts: s.toasts.filter((t) => t.id !== id) })),
+}))
+
+/** Fire a toast from anywhere (including non-component code). */
+export const toast = {
+  info: (m: string) => useToastStore.getState().push(m, 'info'),
+  error: (m: string) => useToastStore.getState().push(m, 'error'),
+}
+
+function ToastItem({ toast }: { toast: Toast }) {
+  const dismiss = useToastStore((s) => s.dismiss)
+  useEffect(() => {
+    const t = setTimeout(() => dismiss(toast.id), 4000)
+    return () => clearTimeout(t)
+  }, [toast.id, dismiss])
+  return (
+    <div
+      role={toast.tone === 'error' ? 'alert' : 'status'}
+      className={cn(
+        'pointer-events-auto rounded-md border px-3 py-2 text-sm shadow-md',
+        toast.tone === 'error'
+          ? 'border-red-500/40 bg-red-500/10 text-red-700 dark:text-red-300'
+          : 'border-border bg-surface text-fg',
+      )}
+    >
+      {toast.message}
+    </div>
+  )
+}
+
+/** Fixed stack of active toasts. Mount once near the app root. */
+export function Toaster() {
+  const toasts = useToastStore((s) => s.toasts)
+  if (toasts.length === 0) return null
+  return (
+    <div className="pointer-events-none fixed bottom-4 left-1/2 z-[60] flex -translate-x-1/2 flex-col items-center gap-2">
+      {toasts.map((t) => (
+        <ToastItem key={t.id} toast={t} />
+      ))}
+    </div>
+  )
+}

web/src/editor/GardenCanvas.tsx

@@ -1,22 +1,40 @@
-import { useEffect, useId, useMemo, useRef, useState } from 'react'
+import { useEffect, useId, useMemo, useRef, useState, type PointerEvent as ReactPointerEvent } from 'react'
-import { Button } from '@/components/ui/Button'
+import { screenToWorld, type Rect, type Size } from '@/lib/geometry'
-import type { Size } from '@/lib/geometry'
+import { useCreateObject } from '@/lib/objects'
 import { ObjectShape } from './ObjectShape'
+import { SelectionOverlay } from './SelectionOverlay'
+import { kindDef } from './kinds'
 import { useEditorStore } from './store'
 import { useViewport } from './useViewport'
 import type { EditorGarden, EditorObject } from './types'
 
 const GRID_CM = 100 // 1 m grid
-const GRID_MIN_CELL_PX = 6 // grid is invisible below this cell size (zoomed out)
+const GRID_MIN_CELL_PX = 6
 const GRID_MAX_OPACITY = 0.18
 
+// Kinds that render beneath beds by default; explicit z_index still wins.
+const UNDER_KINDS = new Set(['path', 'structure', 'in_ground'])
+function defaultZForKind(kind: string): number {
+  if (UNDER_KINDS.has(kind)) return 0
+  if (kind === 'tree') return 2
+  return 1
+}
+
 /**
- * The editor canvas: a full-size SVG with a single world <g> that pan/zoom/pinch
+ * The editor canvas. Pan/zoom/pinch (from useViewport), tap-to-place from the
- * transforms. Renders a 1 m grid that fades in as you zoom, the garden boundary,
+ * armed palette kind, click to select, and — for the selected object —
- * and its objects. Interactions beyond viewport + basic select (move/resize/
+ * move/resize/rotate via SelectionOverlay. The object being dragged is rendered
- * rotate, palette) land in #11; this is the foundation, driven by mock data.
+ * from liveObject for instant feedback; the PATCH fires on release.
  */
-export function GardenCanvas({ garden, objects }: { garden: EditorGarden; objects: EditorObject[] }) {
+export function GardenCanvas({
+  garden,
+  objects,
+  focusId,
+}: {
+  garden: EditorGarden
+  objects: EditorObject[]
+  focusId?: number
+}) {
   const svgRef = useRef<SVGSVGElement>(null)
   const containerRef = useRef<HTMLDivElement>(null)
   const [size, setSize] = useState<Size>({ w: 0, h: 0 })
@@ -26,39 +44,74 @@ export function GardenCanvas({ garden, objects }: { garden: EditorGarden; object
   const viewport = useEditorStore((s) => s.viewport)
   const selectedId = useEditorStore((s) => s.selectedId)
   const select = useEditorStore((s) => s.select)
+  const liveObject = useEditorStore((s) => s.liveObject)
   const { fitToRect } = useViewport(svgRef)
+  const create = useCreateObject(garden.id)
 
-  const gardenRect = useMemo(
+  const gardenRect: Rect = useMemo(
     () => ({ x: 0, y: 0, w: garden.widthCm, h: garden.heightCm }),
     [garden.widthCm, garden.heightCm],
   )
 
-  // Track the container's pixel size for fit math.
   useEffect(() => {
     const el = containerRef.current
     if (!el) return
-    const ro = new ResizeObserver(([entry]) => {
+    const ro = new ResizeObserver(([entry]) => setSize({ w: entry.contentRect.width, h: entry.contentRect.height }))
-      setSize({ w: entry.contentRect.width, h: entry.contentRect.height })
-    })
     ro.observe(el)
     return () => ro.disconnect()
   }, [])
 
-  // Frame the garden once the canvas size is known, and again if we switch to a
-  // different garden.
   useEffect(() => {
     const usable = size.w > 0 && size.h > 0 && garden.widthCm > 0 && garden.heightCm > 0
     if (usable && fittedForRef.current !== garden.id) {
       fittedForRef.current = garden.id
-      fitToRect(gardenRect, size)
+      // ?focus=<id> frames that object (groundwork for #15's focus mode);
+      // otherwise frame the whole garden.
+      const focus = focusId != null ? objects.find((o) => o.id === focusId) : undefined
+      const target: Rect = focus
+        ? { x: focus.xCm - focus.widthCm / 2, y: focus.yCm - focus.heightCm / 2, w: focus.widthCm, h: focus.heightCm }
+        : gardenRect
+      fitToRect(target, size)
     }
-  }, [size, garden.id, garden.widthCm, garden.heightCm, gardenRect, fitToRect])
+  }, [size, garden.id, garden.widthCm, garden.heightCm, gardenRect, fitToRect, focusId, objects])
 
-  // Grid fades in as cells grow from GRID_MIN_CELL_PX to 2× that.
   const cellPx = GRID_CM * viewport.scale
   const gridOpacity = Math.max(0, Math.min(GRID_MAX_OPACITY, ((cellPx - GRID_MIN_CELL_PX) / GRID_MIN_CELL_PX) * GRID_MAX_OPACITY))
 
-  const ordered = useMemo(() => [...objects].sort((a, b) => a.zIndex - b.zIndex), [objects])
+  // Merge the in-flight live geometry over the server objects, then z-order.
+  const rendered = useMemo(() => {
+    const merged = liveObject ? objects.map((o) => (o.id === liveObject.id ? liveObject : o)) : objects
+    return [...merged].sort((a, b) => a.zIndex - b.zIndex)
+  }, [objects, liveObject])
+  const selected = rendered.find((o) => o.id === selectedId) ?? null
+
+  // A pointerdown reaching the svg is empty space: place the armed kind there, or
+  // deselect. (Objects/handles stopPropagation.)
+  function onCanvasPointerDown(e: ReactPointerEvent) {
+    const armed = useEditorStore.getState().armedKind
+    if (!armed) {
+      select(null)
+      return
+    }
+    const def = kindDef(armed)
+    useEditorStore.getState().setArmedKind(null)
+    if (!def) return
+    const rect = svgRef.current?.getBoundingClientRect()
+    if (!rect) return
+    const world = screenToWorld({ x: e.clientX - rect.left, y: e.clientY - rect.top }, viewport)
+    create.mutate(
+      {
+        kind: def.kind,
+        shape: def.shape,
+        xCm: world.x,
+        yCm: world.y,
+        widthCm: def.widthCm,
+        heightCm: def.heightCm,
+        zIndex: defaultZForKind(def.kind),
+      },
+      { onSuccess: (o) => select(o.id) },
+    )
+  }
 
   return (
     <div ref={containerRef} className="relative h-full w-full overflow-hidden rounded-xl border border-border bg-bg">
@@ -66,59 +119,40 @@ export function GardenCanvas({ garden, objects }: { garden: EditorGarden; object
         ref={svgRef}
         className="h-full w-full select-none"
         style={{ touchAction: 'none' }}
-        // Any pointerdown reaching the svg is empty space (objects stopPropagation),
+        onPointerDown={onCanvasPointerDown}
-        // so it deselects.
-        onPointerDown={() => select(null)}
       >
         <g transform={`translate(${viewport.tx} ${viewport.ty}) scale(${viewport.scale})`}>
           {gridOpacity > 0.005 && (
             <>
               <defs>
                 <pattern id={gridId} width={GRID_CM} height={GRID_CM} patternUnits="userSpaceOnUse">
-                  <path
+                  <path d={`M ${GRID_CM} 0 L 0 0 0 ${GRID_CM}`} fill="none" stroke="#808080" strokeOpacity={gridOpacity} strokeWidth={1} vectorEffect="non-scaling-stroke" />
-                    d={`M ${GRID_CM} 0 L 0 0 0 ${GRID_CM}`}
-                    fill="none"
-                    stroke="#808080"
-                    strokeOpacity={gridOpacity}
-                    strokeWidth={1}
-                    vectorEffect="non-scaling-stroke"
-                  />
                 </pattern>
               </defs>
               <rect x={0} y={0} width={garden.widthCm} height={garden.heightCm} fill={`url(#${gridId})`} />
             </>
           )}
 
-          {/* Garden boundary. */}
+          <rect x={0} y={0} width={garden.widthCm} height={garden.heightCm} fill="none" stroke="#3f8f4f" strokeOpacity={0.7} strokeWidth={1.5} vectorEffect="non-scaling-stroke" />
-          <rect
-            x={0}
-            y={0}
-            width={garden.widthCm}
-            height={garden.heightCm}
-            fill="none"
-            stroke="#3f8f4f"
-            strokeOpacity={0.7}
-            strokeWidth={1.5}
-            vectorEffect="non-scaling-stroke"
-          />
 
-          {ordered.map((o) => (
+          {rendered.map((o) => (
             <ObjectShape key={o.id} object={o} selected={o.id === selectedId} onSelect={select} />
           ))}
+
+          {selected && <SelectionOverlay object={selected} gardenId={garden.id} svgRef={svgRef} />}
         </g>
       </svg>
 
-      {/* Overlay: zoom readout + fit control. */}
       <div className="pointer-events-none absolute left-3 top-3 rounded-md bg-surface/80 px-2 py-1 text-xs text-muted backdrop-blur">
         {viewport.scale.toFixed(2)} px/cm
       </div>
-      <Button
+      <button
-        variant="ghost"
+        type="button"
         onClick={() => size.w > 0 && fitToRect(gardenRect, size)}
-        className="absolute bottom-3 right-3 bg-surface/90 py-1.5 shadow-sm backdrop-blur"
+        className="absolute bottom-3 right-3 rounded-md border border-border bg-surface/90 px-3 py-1.5 text-sm font-medium text-fg shadow-sm outline-none backdrop-blur transition-colors hover:bg-border/50 focus-visible:ring-2 focus-visible:ring-accent/40"
       >
         Fit
-      </Button>
+      </button>
     </div>
   )
 }

web/src/editor/Inspector.tsx

@@ -0,0 +1,209 @@
+import { useEffect, useRef, useState, type ChangeEvent } from 'react'
+import { Button } from '@/components/ui/Button'
+import { TextField } from '@/components/ui/TextField'
+import { TextArea } from '@/components/ui/TextArea'
+import { useDeleteObject, useUpdateObject } from '@/lib/objects'
+import { cmFromDisplay, dimensionUnitLabel, displayFromCm, type UnitPref } from '@/lib/units'
+import { kindDef } from './kinds'
+import { useEditorStore } from './store'
+import type { EditorObject } from './types'
+
+/**
+ * Property panel for the selected object. Each field commits a PATCH on
+ * blur/change (carrying the object's version); dimensions and position are shown
+ * in the garden's unit. Keyed by object id in the parent so it re-inits cleanly
+ * on selection change.
+ */
+export function Inspector({
+  object,
+  gardenId,
+  unit,
+}: {
+  object: EditorObject
+  gardenId: number
+  unit: UnitPref
+}) {
+  const update = useUpdateObject(gardenId)
+  const del = useDeleteObject(gardenId)
+  const select = useEditorStore((s) => s.select)
+
+  // Local field state (initialized once; committed on blur/change).
+  const [name, setName] = useState(object.name)
+  const [notes, setNotes] = useState(object.notes)
+  const [width, setWidth] = useState(String(displayFromCm(object.widthCm, unit)))
+  const [height, setHeight] = useState(String(displayFromCm(object.heightCm, unit)))
+  const [x, setX] = useState(String(displayFromCm(object.xCm, unit)))
+  const [y, setY] = useState(String(displayFromCm(object.yCm, unit)))
+  const [rotation, setRotation] = useState(String(Math.round(object.rotationDeg)))
+  const [confirmingDelete, setConfirmingDelete] = useState(false)
+  const rootRef = useRef<HTMLDivElement>(null)
+
+  // When the object changes underneath us (e.g. a canvas move/resize/rotate, or
+  // an optimistic PATCH result), re-sync the fields — unless the user is
+  // actively editing one here, so we don't clobber their typing.
+  useEffect(() => {
+    if (rootRef.current?.contains(document.activeElement)) return
+    setName(object.name)
+    setNotes(object.notes)
+    setWidth(String(displayFromCm(object.widthCm, unit)))
+    setHeight(String(displayFromCm(object.heightCm, unit)))
+    setX(String(displayFromCm(object.xCm, unit)))
+    setY(String(displayFromCm(object.yCm, unit)))
+    setRotation(String(Math.round(object.rotationDeg)))
+  }, [object.version, object.widthCm, object.heightCm, object.xCm, object.yCm, object.rotationDeg, object.name, object.notes, unit])
+
+  const patch = (fields: Partial<Omit<EditorObject, 'id' | 'version'>>) =>
+    update.mutate({ id: object.id, version: object.version, ...fields })
+
+  const commitDim = (raw: string, current: number, apply: (cm: number) => void) => {
+    const v = parseFloat(raw)
+    if (!Number.isFinite(v)) return
+    const cm = cmFromDisplay(v, unit)
+    if (cm !== current) apply(cm)
+  }
+
+  const u = dimensionUnitLabel(unit)
+
+  return (
+    <div ref={rootRef} className="flex flex-col gap-3">
+      <div className="flex items-center justify-between">
+        <h2 className="text-sm font-semibold text-fg">{kindDef(object.kind)?.label ?? object.kind}</h2>
+        <button
+          type="button"
+          onClick={() => select(null)}
+          className="rounded px-1.5 text-sm text-muted hover:text-fg"
+          aria-label="Close inspector"
+        >
+          ✕
+        </button>
+      </div>
+
+      <TextField
+        label="Name"
+        name="name"
+        value={name}
+        onChange={(e) => setName(e.target.value)}
+        onBlur={() => name !== object.name && patch({ name })}
+      />
+
+      <div className="grid grid-cols-2 gap-2">
+        <TextField
+          label={`Width (${u})`}
+          name="width"
+          type="number"
+          inputMode="decimal"
+          step="any"
+          value={width}
+          onChange={(e) => setWidth(e.target.value)}
+          onBlur={() => commitDim(width, object.widthCm, (cm) => patch({ widthCm: cm }))}
+        />
+        <TextField
+          label={`Height (${u})`}
+          name="height"
+          type="number"
+          inputMode="decimal"
+          step="any"
+          value={height}
+          onChange={(e) => setHeight(e.target.value)}
+          onBlur={() => commitDim(height, object.heightCm, (cm) => patch({ heightCm: cm }))}
+        />
+        <TextField
+          label={`X (${u})`}
+          name="x"
+          type="number"
+          inputMode="decimal"
+          step="any"
+          value={x}
+          onChange={(e) => setX(e.target.value)}
+          onBlur={() => commitDim(x, object.xCm, (cm) => patch({ xCm: cm }))}
+        />
+        <TextField
+          label={`Y (${u})`}
+          name="y"
+          type="number"
+          inputMode="decimal"
+          step="any"
+          value={y}
+          onChange={(e) => setY(e.target.value)}
+          onBlur={() => commitDim(y, object.yCm, (cm) => patch({ yCm: cm }))}
+        />
+      </div>
+
+      <TextField
+        label="Rotation (°)"
+        name="rotation"
+        type="number"
+        inputMode="numeric"
+        step="1"
+        value={rotation}
+        onChange={(e) => setRotation(e.target.value)}
+        onBlur={() => {
+          const v = parseFloat(rotation)
+          if (Number.isFinite(v) && v !== object.rotationDeg) patch({ rotationDeg: v })
+        }}
+      />
+
+      <div className="flex items-end gap-2">
+        <div className="flex flex-col gap-1.5">
+          <label htmlFor="obj-color" className="text-sm font-medium text-fg">
+            Color
+          </label>
+          <input
+            id="obj-color"
+            type="color"
+            value={object.color ?? '#8a8a8a'}
+            onChange={(e: ChangeEvent<HTMLInputElement>) => patch({ color: e.target.value })}
+            className="h-9 w-14 cursor-pointer rounded-md border border-border bg-surface"
+          />
+        </div>
+        {object.color && (
+          <Button variant="ghost" className="px-2 py-1.5 text-xs" onClick={() => patch({ color: null })}>
+            Clear
+          </Button>
+        )}
+      </div>
+
+      <label className="flex items-center gap-2 text-sm text-fg">
+        <input
+          type="checkbox"
+          checked={object.plantable}
+          onChange={(e) => patch({ plantable: e.target.checked })}
+          className="h-4 w-4 rounded border-border"
+        />
+        Plantable
+      </label>
+
+      <TextArea
+        label="Notes"
+        name="notes"
+        rows={2}
+        value={notes}
+        onChange={(e) => setNotes(e.target.value)}
+        onBlur={() => notes !== object.notes && patch({ notes })}
+      />
+
+      {confirmingDelete ? (
+        <div className="flex items-center gap-2">
+          <Button
+            variant="danger"
+            className="flex-1"
+            disabled={del.isPending}
+            onClick={() => {
+              select(null)
+              del.mutate(object.id)
+            }}
+          >
+            Confirm delete
+          </Button>
+          <Button variant="ghost" onClick={() => setConfirmingDelete(false)}>
+            Cancel
+          </Button>
+        </div>
+      ) : (
+        <Button variant="ghost" className="text-red-600 dark:text-red-400" onClick={() => setConfirmingDelete(true)}>
+          Delete object
+        </Button>
+      )}
+    </div>
+  )
+}

web/src/editor/Palette.tsx

@@ -0,0 +1,49 @@
+import { cn } from '@/lib/cn'
+import { OBJECT_KINDS, kindDef } from './kinds'
+import { useEditorStore } from './store'
+
+/**
+ * The object-kind palette. Tap a kind to arm it, then tap the canvas to place
+ * (works on desktop and touch). Tapping the armed kind again disarms it.
+ */
+export function Palette() {
+  const armedKind = useEditorStore((s) => s.armedKind)
+  const setArmedKind = useEditorStore((s) => s.setArmedKind)
+  const select = useEditorStore((s) => s.select)
+
+  return (
+    <div className="flex flex-col gap-2">
+      <div className="flex flex-wrap gap-1.5 md:flex-col">
+        {OBJECT_KINDS.map((k) => {
+          const active = armedKind === k.kind
+          return (
+            <button
+              key={k.kind}
+              type="button"
+              onClick={() => {
+                select(null)
+                setArmedKind(active ? null : k.kind)
+              }}
+              className={cn(
+                'flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm font-medium outline-none transition-colors',
+                'focus-visible:ring-2 focus-visible:ring-accent/40',
+                active
+                  ? 'border-accent bg-accent/10 text-accent-strong'
+                  : 'border-border bg-surface text-fg hover:bg-border/50',
+              )}
+              aria-pressed={active}
+            >
+              <span aria-hidden className="text-base leading-none">
+                {k.icon}
+              </span>
+              <span>{k.label}</span>
+            </button>
+          )
+        })}
+      </div>
+      {armedKind && (
+        <p className="text-xs text-muted">Tap the canvas to place a {kindDef(armedKind)?.label ?? 'object'}.</p>
+      )}
+    </div>
+  )
+}

web/src/editor/SelectionOverlay.tsx

@@ -0,0 +1,174 @@
+import type { PointerEvent as ReactPointerEvent, RefObject } from 'react'
+import { localToWorld, screenToWorld, worldToLocal, type Point } from '@/lib/geometry'
+import { useUpdateObject } from '@/lib/objects'
+import { useEditorStore } from './store'
+import type { EditorObject } from './types'
+
+const HANDLE_PX = 12 // on-screen size of the resize handles
+const ROTATE_OFFSET_PX = 28 // distance of the rotate knob above the object
+const MIN_OBJ_CM = 1 // smallest allowed dimension
+const ROTATE_SNAP_DEG = 15
+const SELECT_COLOR = '#2f7a3e'
+
+const corners: [number, number][] = [
+  [-1, -1],
+  [1, -1],
+  [1, 1],
+  [-1, 1],
+]
+
+// Register window listeners for a pointer drag; cleaned up on up/cancel.
+function trackPointer(onMove: (e: PointerEvent) => void, onEnd: () => void) {
+  const move = (e: PointerEvent) => onMove(e)
+  const end = () => {
+    window.removeEventListener('pointermove', move)
+    window.removeEventListener('pointerup', end)
+    window.removeEventListener('pointercancel', end)
+    onEnd()
+  }
+  window.addEventListener('pointermove', move)
+  window.addEventListener('pointerup', end)
+  window.addEventListener('pointercancel', end)
+}
+
+/**
+ * Handles for the selected object: a transparent body to move, four corner
+ * handles to resize (opposite corner stays put, honoring rotation via the
+ * object-local frame), and a knob to rotate (snaps to 15°, free with Shift).
+ * Each gesture updates liveObject for instant feedback and fires exactly one
+ * PATCH on release.
+ */
+export function SelectionOverlay({
+  object,
+  gardenId,
+  svgRef,
+}: {
+  object: EditorObject
+  gardenId: number
+  svgRef: RefObject<SVGSVGElement | null>
+}) {
+  const setLiveObject = useEditorStore((s) => s.setLiveObject)
+  const setObjectDragging = useEditorStore((s) => s.setObjectDragging)
+  const scale = useEditorStore((s) => s.viewport.scale)
+  const update = useUpdateObject(gardenId)
+
+  const halfW = object.widthCm / 2
+  const halfH = object.heightCm / 2
+  const handleCm = HANDLE_PX / scale
+  const rotateOffsetCm = ROTATE_OFFSET_PX / scale
+
+  const pointerWorld = (e: PointerEvent): Point => {
+    const rect = svgRef.current?.getBoundingClientRect()
+    const vp = useEditorStore.getState().viewport
+    const local = rect ? { x: e.clientX - rect.left, y: e.clientY - rect.top } : { x: e.clientX, y: e.clientY }
+    return screenToWorld(local, vp)
+  }
+
+  // Common gesture scaffolding: mark dragging, track the pointer, and on release
+  // fire one PATCH built from the final liveObject.
+  const begin = (
+    e: ReactPointerEvent,
+    onMove: (world: Point) => EditorObject,
+    fields: (final: EditorObject) => Parameters<typeof update.mutate>[0],
+  ) => {
+    e.stopPropagation()
+    e.preventDefault()
+    setObjectDragging(true)
+    trackPointer(
+      (ev) => setLiveObject(onMove(pointerWorld(ev))),
+      () => {
+        const final = useEditorStore.getState().liveObject
+        setObjectDragging(false)
+        setLiveObject(null)
+        if (final) update.mutate(fields(final))
+      },
+    )
+  }
+
+  const base = { ...object }
+  const center0: Point = { x: base.xCm, y: base.yCm }
+
+  const startMove = (e: ReactPointerEvent) => {
+    const start = pointerWorld(e.nativeEvent)
+    begin(
+      e,
+      (world) => ({ ...base, xCm: base.xCm + (world.x - start.x), yCm: base.yCm + (world.y - start.y) }),
+      (f) => ({ id: base.id, version: base.version, xCm: f.xCm, yCm: f.yCm }),
+    )
+  }
+
+  const startResize = (e: ReactPointerEvent, sx: number, sy: number) => {
+    // The corner opposite the dragged one stays fixed (in the object's local
+    // frame, which is anchored at the original center).
+    const oppositeLocal: Point = { x: -sx * halfW, y: -sy * halfH }
+    begin(
+      e,
+      (world) => {
+        const p = worldToLocal(world, center0, base.rotationDeg)
+        const newW = Math.max(MIN_OBJ_CM, Math.abs(p.x - oppositeLocal.x))
+        const newH = Math.max(MIN_OBJ_CM, Math.abs(p.y - oppositeLocal.y))
+        const draggedLocal: Point = { x: oppositeLocal.x + sx * newW, y: oppositeLocal.y + sy * newH }
+        const newCenterLocal: Point = {
+          x: (oppositeLocal.x + draggedLocal.x) / 2,
+          y: (oppositeLocal.y + draggedLocal.y) / 2,
+        }
+        const c = localToWorld(newCenterLocal, center0, base.rotationDeg)
+        return { ...base, xCm: c.x, yCm: c.y, widthCm: newW, heightCm: newH }
+      },
+      (f) => ({ id: base.id, version: base.version, xCm: f.xCm, yCm: f.yCm, widthCm: f.widthCm, heightCm: f.heightCm }),
+    )
+  }
+
+  const startRotate = (e: ReactPointerEvent) => {
+    begin(
+      e,
+      (world) => {
+        // +90° because the knob points up (local -y) at rotation 0.
+        let deg = (Math.atan2(world.y - center0.y, world.x - center0.x) * 180) / Math.PI + 90
+        if (!e.shiftKey) deg = Math.round(deg / ROTATE_SNAP_DEG) * ROTATE_SNAP_DEG
+        deg = ((deg % 360) + 360) % 360
+        return { ...base, rotationDeg: deg }
+      },
+      (f) => ({ id: base.id, version: base.version, rotationDeg: f.rotationDeg }),
+    )
+  }
+
+  return (
+    <g transform={`translate(${object.xCm} ${object.yCm}) rotate(${object.rotationDeg})`}>
+      {/* Transparent body: drag to move. */}
+      {object.shape === 'circle' ? (
+        <ellipse cx={0} cy={0} rx={halfW} ry={halfH} fill="transparent" pointerEvents="all" style={{ cursor: 'move' }} onPointerDown={startMove} />
+      ) : (
+        <rect x={-halfW} y={-halfH} width={object.widthCm} height={object.heightCm} fill="transparent" pointerEvents="all" style={{ cursor: 'move' }} onPointerDown={startMove} />
+      )}
+
+      {/* Selection outline. */}
+      {object.shape === 'circle' ? (
+        <ellipse cx={0} cy={0} rx={halfW} ry={halfH} fill="none" stroke={SELECT_COLOR} strokeWidth={1.5} vectorEffect="non-scaling-stroke" pointerEvents="none" />
+      ) : (
+        <rect x={-halfW} y={-halfH} width={object.widthCm} height={object.heightCm} fill="none" stroke={SELECT_COLOR} strokeWidth={1.5} vectorEffect="non-scaling-stroke" pointerEvents="none" />
+      )}
+
+      {/* Rotate knob. */}
+      <line x1={0} y1={-halfH} x2={0} y2={-halfH - rotateOffsetCm} stroke={SELECT_COLOR} strokeWidth={1} vectorEffect="non-scaling-stroke" pointerEvents="none" />
+      <circle cx={0} cy={-halfH - rotateOffsetCm} r={handleCm * 0.7} fill={SELECT_COLOR} style={{ cursor: 'grab' }} onPointerDown={startRotate} />
+
+      {/* Resize corners. */}
+      {corners.map(([sx, sy]) => (
+        <rect
+          key={`${sx},${sy}`}
+          x={sx * halfW - handleCm / 2}
+          y={sy * halfH - handleCm / 2}
+          width={handleCm}
+          height={handleCm}
+          fill="#ffffff"
+          stroke={SELECT_COLOR}
+          strokeWidth={1}
+          vectorEffect="non-scaling-stroke"
+          style={{ cursor: 'nwse-resize' }}
+          onPointerDown={(e) => startResize(e, sx, sy)}
+        />
+      ))}
+    </g>
+  )
+}

web/src/editor/kinds.ts

@@ -0,0 +1,26 @@
+import type { ObjectShapeKind } from './types'
+
+// The seven placeable object kinds with their palette presentation and sensible
+// default sizes (cm), per the #11 brief.
+export interface KindDef {
+  kind: string
+  label: string
+  icon: string
+  shape: ObjectShapeKind
+  widthCm: number
+  heightCm: number
+}
+
+export const OBJECT_KINDS: KindDef[] = [
+  { kind: 'bed', label: 'Bed', icon: '▭', shape: 'rect', widthCm: 120, heightCm: 240 },
+  { kind: 'grow_bag', label: 'Grow bag', icon: '🛍️', shape: 'circle', widthCm: 40, heightCm: 40 },
+  { kind: 'container', label: 'Container', icon: '🪴', shape: 'circle', widthCm: 60, heightCm: 60 },
+  { kind: 'in_ground', label: 'In-ground', icon: '🟫', shape: 'rect', widthCm: 200, heightCm: 200 },
+  { kind: 'tree', label: 'Tree', icon: '🌳', shape: 'circle', widthCm: 300, heightCm: 300 },
+  { kind: 'path', label: 'Path', icon: '🧱', shape: 'rect', widthCm: 100, heightCm: 300 },
+  { kind: 'structure', label: 'Structure', icon: '🏠', shape: 'rect', widthCm: 200, heightCm: 200 },
+]
+
+export function kindDef(kind: string): KindDef | undefined {
+  return OBJECT_KINDS.find((k) => k.kind === kind)
+}

web/src/editor/store.ts

@@ -1,9 +1,10 @@
 import { create } from 'zustand'
 import type { Viewport } from '@/lib/geometry'
+import type { EditorObject } from './types'
 
 // Ephemeral editor state only (per DESIGN § State): the viewport, the current
-// selection, and which object is "focused" (zoomed into for plops, #15). All
+// selection, the object being live-edited mid-gesture, and the palette kind
-// server state stays in react-query. Selection interactions grow in #11.
+// armed for tap-to-place. All server state stays in react-query.
 
 export const MIN_SCALE = 0.05 // px per cm — fully zoomed out
 export const MAX_SCALE = 20 // px per cm — fully zoomed in
@@ -17,16 +18,39 @@ interface EditorState {
 
   focusedObjectId: number | null
   setFocusedObject: (id: number | null) => void
+
+  // During a move/resize/rotate, the object's live geometry is held here so the
+  // canvas renders it instantly; the PATCH fires only on gesture end.
+  liveObject: EditorObject | null
+  setLiveObject: (o: EditorObject | null) => void
+
+  // The palette kind armed for tap-to-place (mobile-friendly; also set while
+  // dragging a kind from the palette). null when nothing is armed.
+  armedKind: string | null
+  setArmedKind: (kind: string | null) => void
+
+  // True while an object move/resize/rotate is in progress, so the viewport's
+  // pan gesture stands down (both listen on the same svg).
+  objectDragging: boolean
+  setObjectDragging: (v: boolean) => void
 }
 
 export const useEditorStore = create<EditorState>((set) => ({
   viewport: { tx: 0, ty: 0, scale: 1 },
-  setViewport: (next) =>
+  setViewport: (next) => set((s) => ({ viewport: typeof next === 'function' ? next(s.viewport) : next })),
-    set((s) => ({ viewport: typeof next === 'function' ? next(s.viewport) : next })),
 
   selectedId: null,
   select: (id) => set({ selectedId: id }),
 
   focusedObjectId: null,
   setFocusedObject: (id) => set({ focusedObjectId: id }),
+
+  liveObject: null,
+  setLiveObject: (o) => set({ liveObject: o }),
+
+  armedKind: null,
+  setArmedKind: (kind) => set({ armedKind: kind }),
+
+  objectDragging: false,
+  setObjectDragging: (v) => set({ objectDragging: v }),
 }))

web/src/editor/types.ts

@@ -17,7 +17,9 @@ export interface EditorObject {
   rotationDeg: number
   zIndex: number
   color?: string | null
+  notes: string
   plantable: boolean
+  version: number
 }
 
 /** The garden being edited: its bounds define the canvas extent. */

web/src/editor/useViewport.ts

@@ -46,6 +46,8 @@ export function useViewport(svgRef: RefObject<SVGSVGElement | null>) {
     {
       onDragStart: cancelAnim,
       onDrag: ({ delta: [dx, dy], pinching, cancel }) => {
+        // An object move/resize/rotate owns this drag; don't also pan.
+        if (useEditorStore.getState().objectDragging) return
         if (pinching) {
           cancel()
           return

web/src/lib/objects.ts

@@ -0,0 +1,215 @@
+// Garden objects data layer: the /full editor payload plus optimistic
+// create/update/delete mutations. Updates apply to the cache immediately and
+// PATCH with the row version; a 409 rolls back to the server's current row and
+// toasts (see DESIGN § Sync).
+
+import { queryOptions, useMutation, useQuery, useQueryClient, type QueryClient } from '@tanstack/react-query'
+import { z } from 'zod'
+import { ApiError, api } from './api'
+import { gardenSchema } from './gardens'
+import { toast } from '@/components/ui/toast'
+import type { EditorObject, ObjectShapeKind } from '@/editor/types'
+
+const shapeSchema = z.enum(['rect', 'circle', 'polygon'])
+
+export const serverObjectSchema = z.object({
+  id: z.number(),
+  gardenId: z.number(),
+  kind: z.string(),
+  name: z.string(),
+  shape: shapeSchema,
+  xCm: z.number(),
+  yCm: z.number(),
+  widthCm: z.number(),
+  heightCm: z.number(),
+  rotationDeg: z.number(),
+  zIndex: z.number(),
+  plantable: z.boolean(),
+  color: z.string().nullable().optional(),
+  props: z.string().nullable().optional(),
+  notes: z.string(),
+  version: z.number(),
+})
+export type ServerObject = z.infer<typeof serverObjectSchema>
+
+export const fullGardenSchema = z.object({
+  garden: gardenSchema,
+  objects: z.array(serverObjectSchema),
+  plantings: z.array(z.unknown()), // typed in #14
+  plants: z.array(z.unknown()), // typed in #12
+})
+export type FullGarden = z.infer<typeof fullGardenSchema>
+
+/** Map a server object to the canvas's EditorObject (polygon never reaches the
+ *  v1 editor; coerce it to rect defensively). */
+export function toEditorObject(o: ServerObject): EditorObject {
+  const shape: ObjectShapeKind = o.shape === 'circle' ? 'circle' : 'rect'
+  return {
+    id: o.id,
+    kind: o.kind,
+    name: o.name,
+    shape,
+    xCm: o.xCm,
+    yCm: o.yCm,
+    widthCm: o.widthCm,
+    heightCm: o.heightCm,
+    rotationDeg: o.rotationDeg,
+    zIndex: o.zIndex,
+    color: o.color ?? null,
+    notes: o.notes,
+    plantable: o.plantable,
+    version: o.version,
+  }
+}
+
+const fullKey = (gardenId: number) => ['garden-full', gardenId] as const
+
+export function gardenFullQueryOptions(gardenId: number) {
+  return queryOptions({
+    queryKey: fullKey(gardenId),
+    queryFn: async (): Promise<FullGarden> => fullGardenSchema.parse(await api.get(`/gardens/${gardenId}/full`)),
+  })
+}
+
+export function useGardenFull(gardenId: number) {
+  return useQuery(gardenFullQueryOptions(gardenId))
+}
+
+// --- mutations -------------------------------------------------------------
+
+export interface ObjectCreate {
+  kind: string
+  name?: string
+  shape?: ObjectShapeKind
+  xCm: number
+  yCm: number
+  widthCm: number
+  heightCm: number
+  rotationDeg?: number
+  zIndex?: number
+  plantable?: boolean
+  color?: string | null
+}
+
+export function useCreateObject(gardenId: number) {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: async (input: ObjectCreate): Promise<ServerObject> =>
+      serverObjectSchema.parse(await api.post(`/gardens/${gardenId}/objects`, input)),
+    onSuccess: (created) => {
+      // Splice the created object into the cache (avoids a full refetch flash).
+      patchFullCache(qc, gardenId, (full) => ({ ...full, objects: [...full.objects, created] }))
+    },
+    onError: (err) => toast.error(objectErrorMessage(err, 'Could not add that object.')),
+  })
+}
+
+/** Fields the editor patches. version is required for the optimistic guard. */
+export interface ObjectPatch {
+  id: number
+  version: number
+  name?: string
+  xCm?: number
+  yCm?: number
+  widthCm?: number
+  heightCm?: number
+  rotationDeg?: number
+  zIndex?: number
+  plantable?: boolean
+  color?: string | null
+  notes?: string
+}
+
+export function useUpdateObject(gardenId: number) {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: async ({ id, ...body }: ObjectPatch): Promise<ServerObject> =>
+      serverObjectSchema.parse(await api.patch(`/objects/${id}`, body)),
+    // Apply the change to the cache up front so the object doesn't snap back
+    // while the request is in flight. Snapshot for rollback.
+    onMutate: async (patch) => {
+      await qc.cancelQueries({ queryKey: fullKey(gardenId) })
+      const prev = qc.getQueryData<FullGarden>(fullKey(gardenId))
+      patchFullCache(qc, gardenId, (full) => ({
+        ...full,
+        objects: full.objects.map((o) => (o.id === patch.id ? applyServerPatch(o, patch) : o)),
+      }))
+      return { prev }
+    },
+    onSuccess: (updated) => {
+      patchFullCache(qc, gardenId, (full) => ({
+        ...full,
+        objects: full.objects.map((o) => (o.id === updated.id ? updated : o)),
+      }))
+    },
+    onError: (err, _patch, ctx) => {
+      const current = conflictObject(err)
+      if (current) {
+        // Someone else changed it: adopt the server's row and tell the user.
+        patchFullCache(qc, gardenId, (full) => ({
+          ...full,
+          objects: full.objects.map((o) => (o.id === current.id ? current : o)),
+        }))
+        toast.error('That object was updated elsewhere — your change was rolled back.')
+      } else if (ctx?.prev) {
+        qc.setQueryData(fullKey(gardenId), ctx.prev)
+        toast.error(objectErrorMessage(err, 'Could not save that change.'))
+      }
+    },
+    onSettled: () => qc.invalidateQueries({ queryKey: fullKey(gardenId) }),
+  })
+}
+
+export function useDeleteObject(gardenId: number) {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: (id: number) => api.delete(`/objects/${id}`),
+    onMutate: async (id) => {
+      await qc.cancelQueries({ queryKey: fullKey(gardenId) })
+      const prev = qc.getQueryData<FullGarden>(fullKey(gardenId))
+      patchFullCache(qc, gardenId, (full) => ({ ...full, objects: full.objects.filter((o) => o.id !== id) }))
+      return { prev }
+    },
+    onError: (err, _id, ctx) => {
+      if (ctx?.prev) qc.setQueryData(fullKey(gardenId), ctx.prev)
+      toast.error(objectErrorMessage(err, 'Could not delete that object.'))
+    },
+    onSettled: () => qc.invalidateQueries({ queryKey: fullKey(gardenId) }),
+  })
+}
+
+// --- helpers ---------------------------------------------------------------
+
+function patchFullCache(qc: QueryClient, gardenId: number, fn: (full: FullGarden) => FullGarden) {
+  qc.setQueryData<FullGarden>(fullKey(gardenId), (full) => (full ? fn(full) : full))
+}
+
+/** Apply a patch onto a cached server object for the optimistic pass. */
+function applyServerPatch(o: ServerObject, patch: ObjectPatch): ServerObject {
+  return {
+    ...o,
+    ...(patch.name !== undefined ? { name: patch.name } : {}),
+    ...(patch.xCm !== undefined ? { xCm: patch.xCm } : {}),
+    ...(patch.yCm !== undefined ? { yCm: patch.yCm } : {}),
+    ...(patch.widthCm !== undefined ? { widthCm: patch.widthCm } : {}),
+    ...(patch.heightCm !== undefined ? { heightCm: patch.heightCm } : {}),
+    ...(patch.rotationDeg !== undefined ? { rotationDeg: patch.rotationDeg } : {}),
+    ...(patch.zIndex !== undefined ? { zIndex: patch.zIndex } : {}),
+    ...(patch.plantable !== undefined ? { plantable: patch.plantable } : {}),
+    ...(patch.color !== undefined ? { color: patch.color } : {}),
+    ...(patch.notes !== undefined ? { notes: patch.notes } : {}),
+  }
+}
+
+/** The current server row from a 409 conflict body, or null. */
+function conflictObject(err: unknown): ServerObject | null {
+  if (err instanceof ApiError && err.isConflict && err.body && typeof err.body === 'object') {
+    const parsed = serverObjectSchema.safeParse((err.body as { current?: unknown }).current)
+    if (parsed.success) return parsed.data
+  }
+  return null
+}
+
+function objectErrorMessage(err: unknown, fallback: string): string {
+  return err instanceof ApiError ? err.message : fallback
+}

web/src/pages/GardenEditorPage.tsx

@@ -1,31 +1,74 @@
+import { useEffect } from 'react'
+import { getRouteApi } from '@tanstack/react-router'
+import { Alert } from '@/components/ui/Alert'
 import { GardenCanvas } from '@/editor/GardenCanvas'
-import type { EditorGarden, EditorObject } from '@/editor/types'
+import { Inspector } from '@/editor/Inspector'
+import { Palette } from '@/editor/Palette'
+import { useEditorStore } from '@/editor/store'
+import type { EditorGarden } from '@/editor/types'
+import { toEditorObject, useGardenFull } from '@/lib/objects'
 
-// Mock scene for the canvas foundation (#9). #11 replaces this with the garden's
+const routeApi = getRouteApi('/gardens/$gardenId')
-// real /full payload keyed on the route's gardenId.
-const mockGarden: EditorGarden = { id: 0, name: 'Demo garden', widthCm: 1200, heightCm: 800, unitPref: 'metric' }
-
-const mockObjects: EditorObject[] = [
-  { id: 1, kind: 'bed', name: 'Bed A', shape: 'rect', xCm: 300, yCm: 250, widthCm: 400, heightCm: 120, rotationDeg: 0, zIndex: 1, plantable: true },
-  { id: 2, kind: 'bed', name: 'Bed B', shape: 'rect', xCm: 300, yCm: 450, widthCm: 400, heightCm: 120, rotationDeg: 0, zIndex: 1, plantable: true },
-  { id: 3, kind: 'container', name: 'Pot', shape: 'circle', xCm: 800, yCm: 250, widthCm: 120, heightCm: 120, rotationDeg: 0, zIndex: 2, plantable: true },
-  { id: 4, kind: 'path', name: '', shape: 'rect', xCm: 600, yCm: 400, widthCm: 60, heightCm: 720, rotationDeg: 0, zIndex: 0, plantable: false },
-  { id: 5, kind: 'tree', name: 'Apple', shape: 'circle', xCm: 980, yCm: 620, widthCm: 200, heightCm: 200, rotationDeg: 0, zIndex: 2, plantable: false },
-  { id: 6, kind: 'bed', name: 'Angled', shape: 'rect', xCm: 920, yCm: 480, widthCm: 260, heightCm: 100, rotationDeg: 30, zIndex: 1, plantable: true },
-]
 
 export function GardenEditorPage() {
+  const { gardenId } = routeApi.useParams()
+  const gid = Number(gardenId)
+  const { focus } = routeApi.useSearch()
+  const full = useGardenFull(gid)
+
+  const selectedId = useEditorStore((s) => s.selectedId)
+  const select = useEditorStore((s) => s.select)
+  const setArmedKind = useEditorStore((s) => s.setArmedKind)
+  const setLiveObject = useEditorStore((s) => s.setLiveObject)
+
+  // Clear transient editor state on entering/switching gardens and on leaving.
+  useEffect(() => {
+    const reset = () => {
+      select(null)
+      setArmedKind(null)
+      setLiveObject(null)
+    }
+    reset()
+    return reset
+  }, [gid, select, setArmedKind, setLiveObject])
+
+  if (full.isPending) return <p className="p-6 text-sm text-muted">Loading garden…</p>
+  if (full.isError)
+    return (
+      <div className="p-6">
+        <Alert>Could not load this garden.</Alert>
+      </div>
+    )
+
+  const g = full.data.garden
+  const garden: EditorGarden = {
+    id: g.id,
+    name: g.name,
+    widthCm: g.widthCm,
+    heightCm: g.heightCm,
+    unitPref: g.unitPref,
+  }
+  const objects = full.data.objects.map(toEditorObject)
+  const selected = objects.find((o) => o.id === selectedId) ?? null
+
   return (
-    <div className="flex h-[calc(100vh-10rem)] flex-col gap-3">
+    <div className="flex h-[calc(100vh-8rem)] flex-col gap-3 md:flex-row">
-      <div className="flex flex-wrap items-baseline gap-x-2 gap-y-1">
+      <div className="shrink-0 md:w-40">
-        <h1 className="text-lg font-semibold tracking-tight">Editor preview</h1>
+        <h1 className="mb-2 truncate text-lg font-semibold tracking-tight" title={garden.name}>
-        <span className="text-sm text-muted">
+          {garden.name}
-          Mock garden — drag to pan, wheel/pinch to zoom, tap an object to select. Real data + editing land in #11.
+        </h1>
-        </span>
+        <Palette />
       </div>
-      <div className="min-h-0 flex-1">
+
-        <GardenCanvas garden={mockGarden} objects={mockObjects} />
+      <div className="relative min-h-0 flex-1">
+        <GardenCanvas garden={garden} objects={objects} focusId={focus} />
       </div>
+
+      {selected && (
+        <div className="fixed inset-x-0 bottom-0 z-30 max-h-[65vh] overflow-y-auto rounded-t-xl border-t border-border bg-surface p-4 shadow-lg md:static md:max-h-none md:w-72 md:shrink-0 md:rounded-xl md:border md:p-4 md:shadow-sm">
+          <Inspector key={selected.id} object={selected} gardenId={gid} unit={garden.unitPref} />
+        </div>
+      )}
     </div>
   )
 }

web/src/router.tsx

@@ -89,6 +89,11 @@ const gardensRoute = createRoute({
 const gardenEditorRoute = createRoute({
   getParentRoute: () => rootRoute,
   path: 'gardens/$gardenId',
+  // ?focus=<objectId> frames that object on load.
+  validateSearch: (search: Record<string, unknown>): { focus?: number } => {
+    const f = Number(search.focus)
+    return Number.isInteger(f) && f > 0 ? { focus: f } : {}
+  },
   beforeLoad: ({ context, location }) => requireAuth(context, location.href),
   component: GardenEditorPage,
 })