@scrawl-board/board 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/browser.js

@@ -1,4 +1,4 @@
-//#region src/core-internal/assets.ts
+//#region src/core/shapes/assets.ts
 var ASSET_REF_PATTERN = /^asset:[a-z0-9](?:[a-z0-9.-]{0,61}[a-z0-9])?:[A-Za-z0-9._~-]+$/;
 function isAssetRef(value) {
 	return typeof value === "string" && ASSET_REF_PATTERN.test(value) && new TextEncoder().encode(value).length <= 512;
@@ -30,7 +30,7 @@ function clampAssetCacheBytes(value) {
 	return Math.min(ASSET_CACHE_BYTES_MAX, Math.max(ASSET_CACHE_BYTES_MIN, Math.floor(value)));
 }
 //#endregion
-//#region src/core-internal/identifiers.ts
+//#region src/core/document/identifiers.ts
 function documentId(value) {
 	if (!value) throw new TypeError("DocumentId cannot be empty");
 	return value;
@@ -231,7 +231,7 @@ function validation(message, path) {
 	return new DocumentRecoveryError("DOCUMENT_VALIDATION_FAILED", message, void 0, path);
 }
 //#endregion
-//#region src/core-internal/affine2d.ts
+//#region src/core/shapes/affine2d.ts
 var IDENTITY = [
 	1,
 	0,
@@ -315,7 +315,7 @@ function avgScale(m) {
 	return (Math.hypot(m[0], m[1]) + Math.hypot(m[2], m[3])) / 2;
 }
 //#endregion
-//#region src/core-internal/boardSearch.ts
+//#region src/core/document/boardSearch.ts
 function hay(s) {
 	return s.toLowerCase();
 }
@@ -380,7 +380,7 @@ function searchBoard(query, board) {
 	return hits;
 }
 //#endregion
-//#region src/core-internal/types.ts
+//#region src/core/shapes/types.ts
 /** Erasure level at which a point counts as fully erased. */
 var ERASE_THRESHOLD = .95;
 function cloneStroke(stroke) {
@@ -452,7 +452,7 @@ function cloneImage(img) {
 	return { ...img };
 }
 //#endregion
-//#region src/core-internal/clusterStore.ts
+//#region src/core/document/clusterStore.ts
 /** A stroke joins a cluster last written to within this window at full reach. */
 var RECENT_MS = 8e3;
 /** Older clusters are still joinable, at half the gap threshold. */
@@ -623,7 +623,7 @@ function clamp$2(v, lo, hi) {
 	return Math.min(hi, Math.max(lo, v));
 }
 //#endregion
-//#region src/core-internal/extensionTypes.ts
+//#region src/core/shapes/extensionTypes.ts
 function cloneCustomObject(object) {
 	return {
 		...object,
@@ -633,7 +633,7 @@ function cloneCustomObject(object) {
 	};
 }
 //#endregion
-//#region src/core-internal/kitchenTimer.ts
+//#region src/core/shapes/kitchenTimer.ts
 var TIMER_DEFAULT_DURATION_MS = 300 * 1e3;
 function cloneTimer(timer) {
 	return { ...timer };
@@ -683,7 +683,7 @@ function formatTimer(ms) {
 	return `${Math.floor(total / 60)}:${(total % 60).toString().padStart(2, "0")}`;
 }
 //#endregion
-//#region src/core-internal/itemLock.ts
+//#region src/core/shapes/itemLock.ts
 /**
 * Apply or clear a lock in place. Unlock always drops the holder so a stale
 * name cannot linger on an unlocked item.
@@ -720,7 +720,7 @@ function serializeLock(item) {
 	};
 }
 //#endregion
-//#region src/core-internal/document.ts
+//#region src/core/document/document.ts
 /**
 * The one place a live Stroke becomes its wire representation — in
 * particular, points collapse from {x,y,pressure,erase?} objects into
@@ -1279,7 +1279,7 @@ function computeBBox(stroke) {
 	return world;
 }
 //#endregion
-//#region src/core-internal/commands.ts
+//#region src/core/commands/commands.ts
 /** One drawing action — a marker stroke, or a shape's strokes as one unit. */
 var AddStrokesCommand = class {
 	constructor(strokes) {
@@ -1621,7 +1621,7 @@ var LockItemsCommand = class {
 	}
 };
 //#endregion
-//#region src/core-internal/history.ts
+//#region src/core/history/history.ts
 var LIMIT = 200;
 var History = class {
 	constructor(doc) {
@@ -1682,7 +1682,7 @@ var History = class {
 	}
 };
 //#endregion
-//#region src/core-internal/ops.ts
+//#region src/core/events/ops.ts
 var ADDED = [
 	["added", "strokes"],
 	["notesAdded", "notes"],
@@ -1736,10 +1736,18 @@ function changeToOps(change, restoring = false) {
 	return ops;
 }
 //#endregion
-//#region src/core-internal/ribbonEdges.ts
+//#region src/core/shapes/ribbonEdges.ts
 var MIN_WIDTH_FACTOR = .35;
 var END_TAPER = .55;
-function ribbonEdges(points, baseWidth) {
+/**
+* @param handDrawn Default `true`: ink's organic feel — width follows
+* per-point pressure, and both ends taper. Pass `false` for a geometric
+* shape outline, which has no real pressure signal and isn't a pen stroke
+* with a lift-off: it renders at the exact `baseWidth`, uniformly, with no
+* taper at its start/end (which, for a closed shape, is the same point —
+* tapering it would visibly pinch just that one corner).
+*/
+function ribbonEdges(points, baseWidth, handDrawn = true) {
 	const pts = points.length === 1 ? [points[0], {
 		...points[0],
 		x: points[0].x + baseWidth * .05
@@ -1754,8 +1762,8 @@ function ribbonEdges(points, baseWidth) {
 		const len = Math.hypot(dx, dy) || 1;
 		dx /= len;
 		dy /= len;
-		let width = baseWidth * (MIN_WIDTH_FACTOR + (1 - MIN_WIDTH_FACTOR) * pts[i].pressure);
-		if (i === 0 || i === n - 1) width *= END_TAPER;
+		let width = handDrawn ? baseWidth * (MIN_WIDTH_FACTOR + (1 - MIN_WIDTH_FACTOR) * pts[i].pressure) : baseWidth;
+		if (handDrawn && (i === 0 || i === n - 1)) width *= END_TAPER;
 		const hw = width / 2;
 		out[i] = {
 			lx: pts[i].x - dy * hw,
@@ -1768,7 +1776,7 @@ function ribbonEdges(points, baseWidth) {
 	return out;
 }
 //#endregion
-//#region src/core-internal/spatialIndex.ts
+//#region src/core/document/spatialIndex.ts
 var CELL = 8;
 var SpatialIndex = class {
 	constructor(doc) {
@@ -1841,7 +1849,7 @@ function cellsOf(box) {
 	return keys;
 }
 //#endregion
-//#region src/core-internal/stamps.ts
+//#region src/core/shapes/stamps.ts
 var STAMPS = [
 	{
 		kind: "star",
@@ -1889,7 +1897,7 @@ function isStampKind(value) {
 	return typeof value === "string" && STAMPS.some((s) => s.kind === value);
 }
 //#endregion
-//#region src/core-internal/svg.ts
+//#region src/persistence/serialization/svg.ts
 /** Matches the key light used by the board shader and note shadows. */
 var LIGHT = {
 	x: -.25,
@@ -2031,7 +2039,7 @@ function strokeToPaths(stroke) {
 		y,
 		pressure,
 		...erase > 0 ? { erase } : {}
-	})), stroke.baseWidth);
+	})), stroke.baseWidth, stroke.tool !== "shape");
 	const transform = stroke.matrix ? ` transform="matrix(${fmt(stroke.matrix[0])} ${fmt(-stroke.matrix[1])} ${fmt(-stroke.matrix[2])} ${fmt(stroke.matrix[3])} ${fmt(stroke.matrix[4])} ${fmt(-stroke.matrix[5])})"` : "";
 	const baseOpacity = stroke.tool === "highlighter" ? .4 : 1;
 	const paths = [];
@@ -2256,7 +2264,7 @@ function fmt(n) {
 	return String(Math.round(n * 100) / 100);
 }
 //#endregion
-//#region src/core-internal/sceneGeometry.ts
+//#region src/core/shapes/sceneGeometry.ts
 var EMPTY_BOUNDS = {
 	x: 0,
 	y: 0,
@@ -2320,7 +2328,7 @@ function textCorners(x, y, text, fontSize, align, m) {
 	return rectCorners(x + (align === "center" ? -width / 2 : align === "end" ? -width : 0), y, width, height, m);
 }
 //#endregion
-//#region src/core-internal/customObjects.ts
+//#region src/core/shapes/customObjects.ts
 var FALLBACK_LABEL_MAX_LENGTH = 80;
 function toReadonly(object) {
 	return object;
@@ -2449,7 +2457,7 @@ function extensionIdFromType(type) {
 	return slash === -1 ? type : type.slice(0, slash);
 }
 //#endregion
-//#region src/core-internal/extensionRegistry.ts
+//#region src/core/shapes/extensionRegistry.ts
 function buildExtensionRegistry(extensions) {
 	const list = extensions ?? [];
 	const diagnostics = [];
@@ -2546,7 +2554,7 @@ function isWellFormedNamespacedId(id) {
 	return isWellFormedId(id) && id.includes("/") && !id.startsWith("/") && !id.endsWith("/");
 }
 //#endregion
-//#region src/core-internal/assetValidation.ts
+//#region src/persistence/adapters/assetValidation.ts
 function sniffImageMediaType(bytes) {
 	if (bytes.length >= 8 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71 && bytes[4] === 13 && bytes[5] === 10 && bytes[6] === 26 && bytes[7] === 10) return "image/png";
 	if (bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) return "image/jpeg";
@@ -2633,7 +2641,7 @@ function validateDecodedDimensions(width, height) {
 	};
 }
 //#endregion
-//#region src/assetController.ts
+//#region src/persistence/adapters/assetController.ts
 var FAILURE_COALESCE_MS = 4e3;
 var AssetController = class {
 	constructor(resolver, options) {
@@ -2812,7 +2820,7 @@ function toAssetResolutionError(cause, ref) {
 	return new AssetResolutionError("unknown", true, cause instanceof Error ? cause.message : String(cause), ref);
 }
 //#endregion
-//#region src/core-internal/assetExport.ts
+//#region src/persistence/serialization/assetRefCollector.ts
 /** Every unique Asset reference in the document, and which object(s) use it. */
 function collectDocumentAssetRefs(doc, registry) {
 	const refs = /* @__PURE__ */ new Map();
@@ -2839,7 +2847,7 @@ function collectSceneAssetRefs(node, objectId, add) {
 	if (node.kind === "group") for (const child of node.children) collectSceneAssetRefs(child, objectId, add);
 }
 //#endregion
-//#region src/assetExport.ts
+//#region src/persistence/serialization/assetExport.ts
 /** Strict mode's rejection — never contains credentials, a fetchable location, or a raw resolver message. */
 var SvgAssetExportError = class extends Error {
 	constructor(missingAssets) {
@@ -2895,7 +2903,7 @@ function toDataUri(bytes, mediaType) {
 	return `data:${mediaType};base64,${btoa(binary)}`;
 }
 //#endregion
-//#region src/assetIngestion.ts
+//#region src/persistence/adapters/assetIngestion.ts
 async function decodeDimensionsWithImageBitmap(bytes, mediaType) {
 	const blob = new Blob([bytes], { type: mediaType });
 	let bitmap;
@@ -35541,7 +35549,7 @@ var WebGLRenderer = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/data/auditEvents.ts
+//#region src/core/events/auditEvents.ts
 var BY_LABEL = {
 	draw: {
 		action: "create",
@@ -35661,7 +35669,7 @@ function lowerFirst(s) {
 	return s.charAt(0).toLowerCase() + s.slice(1);
 }
 //#endregion
-//#region ../../src/scrawl/assets/AssetTextureCache.ts
+//#region src/renderer/shapes/AssetTextureCache.ts
 var AssetTextureCache = class {
 	constructor(assetController) {
 		this.assetController = assetController;
@@ -35752,7 +35760,7 @@ function toDecodeError(cause, ref) {
 	return new AssetResolutionError("decode-failed", false, cause instanceof Error ? cause.message : String(cause), ref);
 }
 //#endregion
-//#region ../../src/scrawl/engine/raycast.ts
+//#region src/renderer/canvas/raycast.ts
 var origin$1 = new Vector3();
 var target = new Vector3();
 function pointerToBoard(clientX, clientY, canvas, camera) {
@@ -35783,7 +35791,7 @@ function pointerToPlane(clientX, clientY, canvas, camera, z) {
 	};
 }
 //#endregion
-//#region ../../src/scrawl/engine/fog.ts
+//#region src/renderer/canvas/fog.ts
 function createFogUniforms(color) {
 	return {
 		uFogColor: { value: new Color(color) },
@@ -35804,18 +35812,24 @@ var FOG_GLSL = `
   }
 `;
 //#endregion
-//#region ../../src/scrawl/engine/boardSurface.ts
+//#region src/renderer/canvas/boardSurface.ts
 var GRID_MODE_CODE = {
 	none: 0,
 	line: 1,
 	dot: 2
 };
+var TEXTURE_CODE = {
+	flat: 0,
+	textured: 1
+};
 /** Used when a caller doesn't supply one (e.g. ScrawlEngine constructed without a Host theme). */
 var DEFAULT_BOARD_SURFACE_THEME = {
 	color: "#f5f5f3",
 	gridMode: "none",
 	gridColor: "#deded8",
-	gridSpacing: 5
+	gridSpacing: 5,
+	gridLineWidth: 1,
+	surfaceTexture: "flat"
 };
 /** Grid alpha fades out below this on-screen spacing (px) — otherwise it aliases into a solid wash when zoomed out. */
 var GRID_FADE_MIN_PX = 3;
@@ -35836,8 +35850,10 @@ var FRAGMENT = `
   uniform float uGridMode;
   uniform vec3 uGridColor;
   uniform float uGridSpacing;
-  uniform float uGridLineWorld;
+  uniform float uWorldPerPixel;
+  uniform float uGridLineWidthPx;
   uniform float uGridFade;
+  uniform float uSurfaceTexture;
   varying vec3 vWorldPos;
 
   float hash(vec2 p) {
@@ -35857,37 +35873,45 @@ var FRAGMENT = `
   ${FOG_GLSL}
 
   // Distance from p's nearest axis-aligned grid line, in world units.
+  // A crisp, ~uGridLineWidthPx-wide line: full alpha to its half-width, a
+  // ~1px anti-aliased falloff beyond that — not a wide, soft-edged band.
   float gridLineAlpha(vec2 p) {
     vec2 cell = mod(p, uGridSpacing);
     vec2 distToLine = min(cell, uGridSpacing - cell);
-    vec2 lineAlpha2 = 1.0 - smoothstep(uGridLineWorld, uGridLineWorld * 2.0, distToLine);
+    float halfWidth = 0.5 * uGridLineWidthPx * uWorldPerPixel;
+    float aa = uWorldPerPixel;
+    vec2 lineAlpha2 = 1.0 - smoothstep(halfWidth - aa * 0.5, halfWidth + aa * 0.5, distToLine);
     return max(lineAlpha2.x, lineAlpha2.y);
   }
 
-  // Distance from p's nearest grid intersection, in world units.
+  // Distance from p's nearest grid intersection, in world units. Dot radius
+  // matches the configured line width in pixels, same anti-aliasing.
   float gridDotAlpha(vec2 p) {
     vec2 cell = mod(p, uGridSpacing) - uGridSpacing * 0.5;
     float dist = length(cell);
-    float radius = uGridLineWorld * 1.5;
-    return 1.0 - smoothstep(radius, radius * 2.0, dist);
+    float radius = uGridLineWidthPx * uWorldPerPixel;
+    float aa = uWorldPerPixel;
+    return 1.0 - smoothstep(radius - aa * 0.5, radius + aa * 0.5, dist);
   }
 
   void main() {
     vec3 col = uColor;
 
-    // Melamine micro-texture: two octaves of value noise, +-1.75% brightness.
-    float n = vnoise(vWorldPos.xy * 2.3) * 0.6 + vnoise(vWorldPos.xy * 9.7) * 0.4;
-    col *= 1.0 + (n - 0.5) * 0.035;
+    if (uSurfaceTexture > 0.5) {
+      // Melamine micro-texture: two octaves of value noise, +-1.75% brightness.
+      float n = vnoise(vWorldPos.xy * 2.3) * 0.6 + vnoise(vWorldPos.xy * 9.7) * 0.4;
+      col *= 1.0 + (n - 0.5) * 0.035;
 
-    // Satin sheen: Fresnel rim + a specular band from the key light. Both are
-    // ~zero in the straight-on working view and bloom as the camera tilts.
-    vec3 V = normalize(cameraPosition - vWorldPos);
-    vec3 N = vec3(0.0, 0.0, 1.0);
-    float fres = pow(1.0 - max(dot(N, V), 0.0), 3.0);
-    vec3 L = normalize(vec3(-0.25, 0.4, 0.88));
-    vec3 H = normalize(L + V);
-    float spec = pow(max(dot(N, H), 0.0), 90.0);
-    col += (fres * 0.18 + spec * 0.06) * vec3(1.0);
+      // Satin sheen: Fresnel rim + a specular band from the key light. Both
+      // are ~zero in the straight-on working view and bloom as the camera tilts.
+      vec3 V = normalize(cameraPosition - vWorldPos);
+      vec3 N = vec3(0.0, 0.0, 1.0);
+      float fres = pow(1.0 - max(dot(N, V), 0.0), 3.0);
+      vec3 L = normalize(vec3(-0.25, 0.4, 0.88));
+      vec3 H = normalize(L + V);
+      float spec = pow(max(dot(N, H), 0.0), 90.0);
+      col += (fres * 0.18 + spec * 0.06) * vec3(1.0);
+    }
 
     if (uGridMode > 0.5 && uGridFade > 0.001) {
       float gridAlpha = (uGridMode < 1.5 ? gridLineAlpha(vWorldPos.xy) : gridDotAlpha(vWorldPos.xy)) * uGridFade;
@@ -35907,8 +35931,10 @@ function createBoardSurface(fog, theme) {
 			uGridMode: { value: GRID_MODE_CODE[theme.gridMode] },
 			uGridColor: { value: new Color(theme.gridColor) },
 			uGridSpacing: { value: Math.max(.001, theme.gridSpacing) },
-			uGridLineWorld: { value: .05 },
+			uGridLineWidthPx: { value: Math.max(.1, theme.gridLineWidth) },
+			uWorldPerPixel: { value: .05 },
 			uGridFade: { value: 0 },
+			uSurfaceTexture: { value: TEXTURE_CODE[theme.surfaceTexture] },
 			...fog
 		}
 	});
@@ -35916,13 +35942,15 @@ function createBoardSurface(fog, theme) {
 	mesh.name = "board-surface";
 	return mesh;
 }
-/** Applies a theme change (initial or live) — everything except the per-frame fade/line-width. */
+/** Applies a theme change (initial or live) — everything except the per-frame fade/pixel-ratio. */
 function setBoardSurfaceTheme(mesh, theme) {
 	const uniforms = mesh.material.uniforms;
 	uniforms.uColor.value.set(theme.color);
 	uniforms.uGridMode.value = GRID_MODE_CODE[theme.gridMode];
 	uniforms.uGridColor.value.set(theme.gridColor);
 	uniforms.uGridSpacing.value = Math.max(.001, theme.gridSpacing);
+	uniforms.uGridLineWidthPx.value = Math.max(.1, theme.gridLineWidth);
+	uniforms.uSurfaceTexture.value = TEXTURE_CODE[theme.surfaceTexture];
 }
 /** Keep the plane centered under the view, larger than the fog horizon, and the grid's on-screen weight/fade current. */
 function updateBoardSurface(mesh, centerX, centerY, fogFar, worldPerPixel) {
@@ -35930,7 +35958,7 @@ function updateBoardSurface(mesh, centerX, centerY, fogFar, worldPerPixel) {
 	const size = fogFar * 2.5;
 	mesh.scale.set(size, size, 1);
 	const uniforms = mesh.material.uniforms;
-	uniforms.uGridLineWorld.value = worldPerPixel;
+	uniforms.uWorldPerPixel.value = worldPerPixel;
 	const t = (uniforms.uGridSpacing.value / Math.max(1e-6, worldPerPixel) - GRID_FADE_MIN_PX) / (GRID_FADE_MAX_PX - GRID_FADE_MIN_PX);
 	uniforms.uGridFade.value = MathUtils.clamp(t, 0, 1);
 }
@@ -36103,7 +36131,7 @@ var CameraRig = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/engine/scene.ts
+//#region src/renderer/canvas/scene.ts
 var SceneRig = class {
 	constructor(canvas, boardTheme) {
 		this.renderer = new WebGLRenderer({
@@ -36150,7 +36178,7 @@ var SceneRig = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/ink/inkMaterial.ts
+//#region src/renderer/shapes/inkMaterial.ts
 var VERTEX = `
   attribute float aAlpha;
   varying vec2 vUv;
@@ -36281,15 +36309,15 @@ var InkMaterials = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/ink/ribbonGeometry.ts
+//#region src/renderer/shapes/ribbonGeometry.ts
 /** Ink floats a hair above the board to avoid z-fighting with the surface. */
 var INK_Z = .02;
 /** Highlighter always renders under opaque ink (build prompt §4.1). */
 var HIGHLIGHT_Z = .016;
 /** Ghosts sit under everything so live strokes always read on top. */
 var GHOST_Z = .012;
-function buildRibbonGeometry(points, baseWidth, z = INK_Z) {
-	const edges = ribbonEdges(points, baseWidth);
+function buildRibbonGeometry(points, baseWidth, z = INK_Z, handDrawn = true) {
+	const edges = ribbonEdges(points, baseWidth, handDrawn);
 	const n = edges.length;
 	const positions = new Float32Array(n * 2 * 3);
 	const uvs = new Float32Array(n * 2 * 2);
@@ -36332,8 +36360,10 @@ function buildRibbonGeometry(points, baseWidth, z = INK_Z) {
 	return geometry;
 }
 //#endregion
-//#region ../../src/scrawl/ink/strokeRenderer.ts
+//#region src/renderer/shapes/strokeRenderer.ts
 var strokeZ = (stroke) => stroke.tool === "highlighter" ? HIGHLIGHT_Z : INK_Z;
+/** Shapes (rect/ellipse/line/arrow/...) are geometric outlines, not pressure-sensitive ink. */
+var handDrawn = (stroke) => stroke.tool !== "shape";
 /**
 * Derives ink meshes from the document by subscription — the document never
 * knows the renderer exists. Also hosts session-only ghosts (decision Q7)
@@ -36358,12 +36388,12 @@ var StrokeRenderer = class {
 		this.ghostGroup.visible = visible;
 	}
 	/** Leave a smeared residue of an erased span (never persisted). */
-	addGhost(points, color, baseWidth) {
+	addGhost(points, color, baseWidth, handDrawn = true) {
 		if (points.length < 2) return;
 		const mesh = new Mesh(buildRibbonGeometry(points.map((p) => ({
 			...p,
 			erase: 0
-		})), baseWidth * 1.7, GHOST_Z), this.materials.ghost(color));
+		})), baseWidth * 1.7, GHOST_Z, handDrawn), this.materials.ghost(color));
 		this.ghostGroup.add(mesh);
 	}
 	/**
@@ -36375,7 +36405,7 @@ var StrokeRenderer = class {
 		if (this.meshes.has(stroke.id) || this.retiredLive.has(stroke.id) || stroke.points.length < 2) return;
 		this.liveUser.set(stroke.id, userId);
 		const existing = this.liveMeshes.get(stroke.id);
-		const geometry = buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke));
+		const geometry = buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke), handDrawn(stroke));
 		if (existing) {
 			existing.geometry.dispose();
 			existing.geometry = geometry;
@@ -36435,7 +36465,7 @@ var StrokeRenderer = class {
 			const mesh = this.meshes.get(stroke.id);
 			if (mesh) {
 				mesh.geometry.dispose();
-				mesh.geometry = buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke));
+				mesh.geometry = buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke), handDrawn(stroke));
 			}
 		}
 		for (const stroke of change.transformed) {
@@ -36444,7 +36474,7 @@ var StrokeRenderer = class {
 		}
 	}
 	create(stroke) {
-		const mesh = new Mesh(buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke)), stroke.tool === "highlighter" ? this.materials.highlight(stroke.color) : this.materials.get(stroke.color));
+		const mesh = new Mesh(buildRibbonGeometry(stroke.points, stroke.baseWidth, strokeZ(stroke), handDrawn(stroke)), stroke.tool === "highlighter" ? this.materials.highlight(stroke.color) : this.materials.get(stroke.color));
 		mesh.matrixAutoUpdate = false;
 		syncMatrix(mesh, stroke);
 		this.meshes.set(stroke.id, mesh);
@@ -36465,7 +36495,7 @@ function syncMatrix(mesh, stroke) {
 	mesh.matrixWorldNeedsUpdate = true;
 }
 //#endregion
-//#region ../../src/scrawl/scene-objects/markerProp.ts
+//#region src/renderer/shapes/markerProp.ts
 var BODY_LENGTH = 11;
 var BODY_RADIUS = .85;
 var TIP_LENGTH = 1.6;
@@ -36561,7 +36591,7 @@ var MarkerProp = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/scene-objects/noteGeometry.ts
+//#region src/renderer/shapes/noteGeometry.ts
 /**
 * Height of the sheet above the board at (u, v) ∈ [0,1]².
 * v = 1 is the adhesive edge (always 0); u = 1 is the peel corner side.
@@ -36605,7 +36635,7 @@ function applyCurl(geometry, curl, peel) {
 	color.needsUpdate = true;
 }
 //#endregion
-//#region ../../src/scrawl/scene-objects/stickyNotes.ts
+//#region src/renderer/shapes/stickyNotes.ts
 var TEXTURE_SIZE = 512;
 var FOCUS_COLOR$4 = 2450411;
 var CURL = .3;
@@ -43181,7 +43211,7 @@ SYNCABLE_PROPS.forEach((prop) => {
 new Box3();
 new Color();
 //#endregion
-//#region ../../src/scrawl/scene-objects/tables.ts
+//#region src/renderer/shapes/tables.ts
 var FONT_URL$2 = "/fonts/inter-medium.woff";
 var TABLE_Z = .012;
 var HEADER_Z = .014;
@@ -43530,7 +43560,7 @@ var TablesRenderer = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/scene-objects/textBlocks.ts
+//#region src/renderer/text/textBlocks.ts
 var FONT_URL$1 = "/fonts/inter-medium.woff";
 var TEXT_Z = .02;
 var FOCUS_COLOR$2 = 2450411;
@@ -43634,7 +43664,7 @@ var TextBlocksRenderer = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/scene-objects/comments.ts
+//#region src/renderer/shapes/comments.ts
 var PIN_Z = .04;
 var PIN_WIDTH = 3.6;
 var PIN_HEIGHT = 3.6;
@@ -43802,7 +43832,7 @@ function drawBubblePath(ctx, x, y, w, h, r, tailX, tailY, tailW) {
 	ctx.closePath();
 }
 //#endregion
-//#region ../../src/scrawl/scene-objects/images.ts
+//#region src/renderer/shapes/images.ts
 var IMAGE_Z = .015;
 var FRAME_BORDER = .4;
 var FOCUS_COLOR$1 = 2450411;
@@ -44012,7 +44042,7 @@ function applyPlaceholderTexture(visual, label) {
 	visual.imageMesh.material.needsUpdate = true;
 }
 //#endregion
-//#region ../../src/scrawl/scene-objects/kitchenTimers.ts
+//#region src/renderer/shapes/kitchenTimers.ts
 var FACE_SIZE = 256;
 var BODY_COLOR = 14753096;
 var KNOB_COLOR = 16448250;
@@ -44210,7 +44240,7 @@ function renderTimerFace(timer, canvas, now = Date.now()) {
 	return c;
 }
 //#endregion
-//#region ../../src/scrawl/scene-objects/customObjects.ts
+//#region src/renderer/shapes/customObjects.ts
 var FONT_URL = "/fonts/inter-medium.woff";
 var CUSTOM_Z = .02;
 var FOCUS_COLOR = 2450411;
@@ -44572,7 +44602,7 @@ function disposeObject3D(obj) {
 	});
 }
 //#endregion
-//#region ../../src/scrawl/tools/hitTest.ts
+//#region src/interaction/pointer/hitTest.ts
 /** Topmost (most recently added) stroke under the point, or null. */
 function hitStroke(doc, index, p, slop) {
 	const candidates = index.query(p.x - slop, p.y - slop, p.x + slop, p.y + slop);
@@ -44583,9 +44613,10 @@ function hitStroke(doc, index, p, slop) {
 		const scale = m ? avgScale(m) : 1;
 		let prev = null;
 		let prevWidth = 0;
+		const handDrawn = stroke.tool !== "shape";
 		for (const point of stroke.points) {
 			const world = m ? apply(m, point) : point;
-			const width = stroke.baseWidth * (MIN_WIDTH_FACTOR + (1 - MIN_WIDTH_FACTOR) * point.pressure) * scale;
+			const width = (handDrawn ? stroke.baseWidth * (MIN_WIDTH_FACTOR + (1 - MIN_WIDTH_FACTOR) * point.pressure) : stroke.baseWidth) * scale;
 			if (prev) {
 				const reach = Math.max(width, prevWidth) / 2 + slop;
 				if (distToSegmentSq(p, prev, world) <= reach * reach) {
@@ -44613,7 +44644,7 @@ function distToSegmentSq(p, a, b) {
 	return dx * dx + dy * dy;
 }
 //#endregion
-//#region ../../src/scrawl/tools/eraserTool.ts
+//#region src/interaction/tools/eraserTool.ts
 var DECAY_PER_PASS = .4;
 /** A point can take another decay pass after this long — rubbing works. */
 var REARM_MS = 250;
@@ -44719,7 +44750,7 @@ var EraserTool = class {
 					...p,
 					...apply(m, p)
 				})) : run.points;
-				this.ctx.renderer.addGhost(world, current.color, current.baseWidth * (m ? avgScale(m) : 1));
+				this.ctx.renderer.addGhost(world, current.color, current.baseWidth * (m ? avgScale(m) : 1), current.tool !== "shape");
 			}
 		}
 		doc.removeStrokes(before.map((s) => s.id));
@@ -44741,7 +44772,7 @@ function partitionByErasure(points) {
 	return runs;
 }
 //#endregion
-//#region ../../src/scrawl/tools/noteDrag.ts
+//#region src/interaction/tools/noteDrag.ts
 /**
 * Drag the focused note in X/Y. The grab is resolved on the note's own
 * z-plane, not the board, so the note doesn't jump under a tilted ray.
@@ -44808,7 +44839,7 @@ var NoteDragState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/imageDrag.ts
+//#region src/interaction/tools/imageDrag.ts
 /** Drag the focused image in X/Y; one command per drag. */
 var ImageDragState = class {
 	constructor(ctx) {
@@ -44860,7 +44891,7 @@ var ImageDragState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/timerDrag.ts
+//#region src/interaction/tools/timerDrag.ts
 /** Drag the focused timer in X/Y; one command per drag. */
 var TimerDragState = class {
 	constructor(ctx) {
@@ -44912,7 +44943,7 @@ var TimerDragState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/shapes.ts
+//#region src/interaction/tools/shapeGeometry.ts
 /** Uniform synthetic pressure; the ink shader supplies the hand-drawn feel. */
 var PRESSURE = .7;
 var MIN_ELLIPSE_SEGMENTS = 24;
@@ -44952,10 +44983,7 @@ function rect(a, b, step) {
 		a
 	];
 	const out = [];
-	for (let i = 0; i < corners.length - 1; i++) {
-		const edge = sampleSegment(corners[i], corners[i + 1], step);
-		out.push(...i === 0 ? edge : edge.slice(1));
-	}
+	for (let i = 0; i < corners.length - 1; i++) out.push(...sampleSegment(corners[i], corners[i + 1], step));
 	return out;
 }
 function ellipse(a, b, step) {
@@ -45026,10 +45054,7 @@ function polygon(sides, a, b, step, startAngle = -Math.PI / 2) {
 	}
 	vertices.push(vertices[0]);
 	const out = [];
-	for (let i = 0; i < vertices.length - 1; i++) {
-		const edge = sampleSegment(vertices[i], vertices[i + 1], step);
-		out.push(...i === 0 ? edge : edge.slice(1));
-	}
+	for (let i = 0; i < vertices.length - 1; i++) out.push(...sampleSegment(vertices[i], vertices[i + 1], step));
 	return out;
 }
 function star(points, a, b, step) {
@@ -45053,10 +45078,7 @@ function star(points, a, b, step) {
 	}
 	vertices.push(vertices[0]);
 	const out = [];
-	for (let i = 0; i < vertices.length - 1; i++) {
-		const edge = sampleSegment(vertices[i], vertices[i + 1], step);
-		out.push(...i === 0 ? edge : edge.slice(1));
-	}
+	for (let i = 0; i < vertices.length - 1; i++) out.push(...sampleSegment(vertices[i], vertices[i + 1], step));
 	return out;
 }
 function heart(a, b, step) {
@@ -45101,7 +45123,7 @@ function snappedEnd(a, b) {
 	};
 }
 //#endregion
-//#region ../../src/scrawl/tools/shapeTool.ts
+//#region src/interaction/tools/shapeTool.ts
 var MIN_DRAG_PX$1 = 4;
 /** Drag out a shape; live preview through the real ink material. */
 var ShapeTool = class {
@@ -45132,7 +45154,8 @@ var ShapeTool = class {
 			const strokes = this.polylines.map((points) => ({
 				id: crypto.randomUUID(),
 				color: this.ctx.inkColor(),
-				baseWidth: this.ctx.baseWidth(),
+				baseWidth: this.ctx.shapeStrokeWidth(),
+				tool: "shape",
 				points
 			}));
 			this.ctx.clusters.assign(strokes[0]);
@@ -45166,13 +45189,13 @@ var ShapeTool = class {
 			this.previews[i].visible = polyline !== void 0;
 			if (polyline) {
 				this.previews[i].geometry.dispose();
-				this.previews[i].geometry = buildRibbonGeometry(polyline, this.ctx.baseWidth());
+				this.previews[i].geometry = buildRibbonGeometry(polyline, this.ctx.shapeStrokeWidth(), void 0, false);
 			}
 		}
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/tableDrag.ts
+//#region src/interaction/tools/tableDrag.ts
 function getHandleCursor(handle) {
 	switch (handle) {
 		case "nw":
@@ -45292,7 +45315,7 @@ var TableDragState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/tableTool.ts
+//#region src/interaction/tools/tableTool.ts
 var MIN_DRAG_PX = 6;
 var TableTool = class {
 	constructor(ctx) {
@@ -45423,7 +45446,7 @@ var TableTool = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/commentTool.ts
+//#region src/interaction/tools/commentTool.ts
 /** Click on the board to drop a new comment pin or open an existing one. */
 var CommentTool = class {
 	constructor(ctx) {
@@ -45458,7 +45481,7 @@ var CommentTool = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/textDrag.ts
+//#region src/interaction/tools/textDrag.ts
 /** Drag the focused text block in X/Y; one command per drag. */
 var TextDragState = class {
 	constructor(ctx) {
@@ -45510,7 +45533,7 @@ var TextDragState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/fsm.ts
+//#region src/interaction/tools/fsm.ts
 var ToolStateMachine = class {
 	constructor() {
 		this.states = /* @__PURE__ */ new Map();
@@ -45712,7 +45735,7 @@ var IdleState = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/gizmo.ts
+//#region src/renderer/selection/gizmo.ts
 var GIZMO_Z = .05;
 var HANDLE_PX = 9;
 var HANDLE_HIT_PX = 12;
@@ -45943,7 +45966,7 @@ function boxesEqual(a, b) {
 	return a.minX === b.minX && a.minY === b.minY && a.maxX === b.maxX && a.maxY === b.maxY;
 }
 //#endregion
-//#region ../../src/scrawl/ink/pressure.ts
+//#region src/interaction/tools/pressure.ts
 var SIM_MAX = 1;
 var SIM_MIN = .3;
 var SMOOTHING = .25;
@@ -45965,7 +45988,7 @@ function clamp(v, lo, hi) {
 	return Math.min(hi, Math.max(lo, v));
 }
 //#endregion
-//#region ../../src/scrawl/ink/strokeBuilder.ts
+//#region src/interaction/tools/strokeBuilder.ts
 var StrokeBuilder = class {
 	constructor() {
 		this.points = [];
@@ -46015,7 +46038,7 @@ function catmullRom(v0, v1, v2, v3, t) {
 	return .5 * (2 * v1 + (-v0 + v2) * t + (2 * v0 - 5 * v1 + 4 * v2 - v3) * t2 + (-v0 + 3 * v1 - 3 * v2 + v3) * t3);
 }
 //#endregion
-//#region ../../src/scrawl/tools/markerTool.ts
+//#region src/interaction/tools/markerTool.ts
 /** Sample spacing while drawing, in screen pixels. */
 var MIN_SAMPLE_PX = 1.5;
 /** A highlighter is a chisel tip: near-constant width, little pressure play. */
@@ -46118,7 +46141,7 @@ var MarkerTool = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/orbitTool.ts
+//#region src/interaction/tools/orbitTool.ts
 /**
 * Orbit-preview (build prompt §4.2): alt-drag tilts the camera off-axis to
 * read the board's material and depth; releasing eases back to the working
@@ -46153,7 +46176,7 @@ var OrbitTool = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/panTool.ts
+//#region src/interaction/tools/panTool.ts
 /** Grab-pan: content follows the pointer. */
 var PanTool = class {
 	constructor(ctx) {
@@ -46183,7 +46206,7 @@ var PanTool = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/selection.ts
+//#region src/renderer/selection/selection.ts
 /** The set of selected stroke ids. Drops ids the document no longer has. */
 var SelectionManager = class {
 	constructor(doc) {
@@ -46234,7 +46257,7 @@ var SelectionManager = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/tools/selectTool.ts
+//#region src/interaction/tools/selectTool.ts
 var HIT_SLOP_PX = 4;
 var CLICK_TOLERANCE_PX = 3;
 var MIN_SCALE = .05;
@@ -46450,7 +46473,7 @@ function safeRatio(numerator, denominator) {
 	return raw;
 }
 //#endregion
-//#region ../../src/scrawl/tools/customTool.ts
+//#region src/interaction/tools/customTool.ts
 function extensionIdFromToolId(toolId) {
 	const slash = toolId.indexOf("/");
 	return slash === -1 ? toolId : toolId.slice(0, slash);
@@ -46565,12 +46588,19 @@ var ExtensionCommandBatch = class {
 	}
 };
 //#endregion
-//#region ../../src/scrawl/ScrawlEngine.ts
+//#region src/composition/ScrawlEngine.ts
 /** Marker stroke width in board units (~1% of the default view height). */
 var BASE_WIDTH = .5;
 /** Highlighter chisel width — wide enough to cover a line of handwriting. */
 var HIGHLIGHT_WIDTH = 2.2;
 /**
+* Shape (rectangle, ellipse, arrow, ...) border width in board units.
+* Deliberately thinner than BASE_WIDTH: a shape border reads as a crisp,
+* structural line, not an expressive marker stroke — this is also the
+* fallback when no Host theme configures ScrawlTheme.shapeStrokeWidth.
+*/
+var DEFAULT_SHAPE_STROKE_WIDTH = .15;
+/**
 * Identity of a rendered selection badge: which item, its lock state, and
 * where it sits on screen (rounded to the pixel, so sub-pixel camera drift
 * does not churn React).
@@ -46591,10 +46621,11 @@ function emptyExtensionRegistry() {
 * React never reaches past this class.
 */
 var ScrawlEngine = class {
-	constructor(canvas, documentId$1, extensionRegistry = emptyExtensionRegistry(), assetController = new AssetController(void 0), boardTheme = DEFAULT_BOARD_SURFACE_THEME) {
+	constructor(canvas, documentId$1, extensionRegistry = emptyExtensionRegistry(), assetController = new AssetController(void 0), boardTheme = DEFAULT_BOARD_SURFACE_THEME, shapeStrokeWidth = DEFAULT_SHAPE_STROKE_WIDTH) {
 		this.canvas = canvas;
 		this.extensionRegistry = extensionRegistry;
 		this.boardTheme = boardTheme;
+		this.shapeStrokeWidth = shapeStrokeWidth;
 		this.onToolChange = null;
 		this.onZoomChange = null;
 		this.onAuditEvent = null;
@@ -46689,6 +46720,7 @@ var ScrawlEngine = class {
 			setTool: (t) => this.setTool(t),
 			inkColor: () => this.tool === "highlighter" ? this.highlightColor : this.color,
 			baseWidth: () => this.tool === "highlighter" ? HIGHLIGHT_WIDTH : BASE_WIDTH,
+			shapeStrokeWidth: () => this.shapeStrokeWidth,
 			activeTool: () => this.tool,
 			isSpaceHeld: () => this.spaceHeld,
 			pointerToBoard: (e) => pointerToBoard(e.clientX, e.clientY, canvas, this.scene.cameraRig.camera),
@@ -46953,6 +46985,10 @@ var ScrawlEngine = class {
 		this.boardTheme = theme;
 		this.scene.applyBoardTheme(theme);
 	}
+	/** Live update of the shape tool's border width (board units). Already-drawn shapes keep the width they were drawn with. */
+	setShapeStrokeWidth(width) {
+		this.shapeStrokeWidth = width;
+	}
 	/**
 	* Snap to a peer's camera. No-op while drawing so pointer-to-board
 	* mapping does not warp the in-progress stroke.
@@ -48014,7 +48050,7 @@ var ScrawlEngine = class {
 	}
 };
 //#endregion
-//#region src/controller-internal.ts
+//#region src/composition/controller-internal.ts
 function createBoardController(options) {
 	return createBoardControllerWithEngine(options);
 }
@@ -48032,9 +48068,12 @@ function createBoardControllerWithEngine(options, existingEngine) {
 		color: options.boardTheme?.surface ?? DEFAULT_BOARD_SURFACE_THEME.color,
 		gridMode: options.boardTheme?.gridMode ?? DEFAULT_BOARD_SURFACE_THEME.gridMode,
 		gridColor: options.boardTheme?.gridColor ?? DEFAULT_BOARD_SURFACE_THEME.gridColor,
-		gridSpacing: options.boardTheme?.gridSpacing ?? DEFAULT_BOARD_SURFACE_THEME.gridSpacing
+		gridSpacing: options.boardTheme?.gridSpacing ?? DEFAULT_BOARD_SURFACE_THEME.gridSpacing,
+		gridLineWidth: options.boardTheme?.gridLineWidth ?? DEFAULT_BOARD_SURFACE_THEME.gridLineWidth,
+		surfaceTexture: options.boardTheme?.surfaceTexture ?? DEFAULT_BOARD_SURFACE_THEME.surfaceTexture
 	};
-	const engine = existingEngine ?? (options.canvas ? new ScrawlEngine(options.canvas, options.document.id, extensionRegistry, assetController, currentBoardTheme) : null);
+	let currentShapeStrokeWidth = options.boardTheme?.shapeStrokeWidth ?? .15;
+	const engine = existingEngine ?? (options.canvas ? new ScrawlEngine(options.canvas, options.document.id, extensionRegistry, assetController, currentBoardTheme, currentShapeStrokeWidth) : null);
 	const document = engine?.document ?? new BoardDocument(documentId(options.document.id));
 	const history = engine?.history ?? new History(document);
 	const createId = options.createId ?? (() => crypto.randomUUID());
@@ -48523,9 +48562,15 @@ function createBoardControllerWithEngine(options, existingEngine) {
 				color: theme.surface ?? currentBoardTheme.color,
 				gridMode: theme.gridMode ?? currentBoardTheme.gridMode,
 				gridColor: theme.gridColor ?? currentBoardTheme.gridColor,
-				gridSpacing: theme.gridSpacing ?? currentBoardTheme.gridSpacing
+				gridSpacing: theme.gridSpacing ?? currentBoardTheme.gridSpacing,
+				gridLineWidth: theme.gridLineWidth ?? currentBoardTheme.gridLineWidth,
+				surfaceTexture: theme.surfaceTexture ?? currentBoardTheme.surfaceTexture
 			};
 			engine?.applyBoardTheme(currentBoardTheme);
+			if (theme.shapeStrokeWidth !== void 0) {
+				currentShapeStrokeWidth = theme.shapeStrokeWidth;
+				engine?.setShapeStrokeWidth(currentShapeStrokeWidth);
+			}
 		} },
 		view: {
 			fit() {