cozyclay 3.0.3 → 3.1.1

package/src/stage-gizmo.js

@@ -0,0 +1,43 @@
+import { placementAt } from "./root-path.js";
+import { shotAtFrame } from "./cuts.js";
+
+export function characterGizmoView({ selected, characters, activeCharacterId, activeCharacter, motion, shots, activeId, frame }) {
+	if (!selected) return null;
+	const entry = characters.find((item) => item.id === activeId);
+	if (!entry || entry.hidden) return null;
+	const hasTake = activeId === activeCharacterId ? Boolean(motion) : Boolean(activeCharacter.sessionMotion);
+	const placement = hasTake ? entry : placementAt(entry, frame, { shotAt: (at) => shotAtFrame(shots, at) });
+	return { position: [placement.x, entry.y ?? 0, placement.z], rot: placement.rot };
+}
+
+export function characterGizmoObject(gizmoView, entry) {
+	if (!gizmoView) return null;
+	return {
+		id: "__character__",
+		x: gizmoView.position[0],
+		y: gizmoView.position[1],
+		z: gizmoView.position[2],
+		height: 1.15,
+		footprint: { width: 0.6, depth: 0.6 },
+		rotY: gizmoView.rot ?? entry?.rot ?? 0,
+		scaleX: entry?.scale ?? 1,
+		scaleY: entry?.scale ?? 1,
+		scaleZ: entry?.scale ?? 1,
+	};
+}
+
+export function playbackSceneWithTrack(base, subjectTrack, followTrack) {
+	return { ...base, subjectTrack, cameraTrack: followTrack };
+}
+
+export function followCameraActive(mode, track, frame, preview, ikMode, waypointMode, posing) {
+	return mode !== "keys" && Boolean(track?.[frame]) && (preview || (!ikMode && !waypointMode && !posing));
+}
+
+export function updateShotMetrics({ position, visible, playing, setCameraPos, setSubjectVisible, cameraRef, visibleRef }) {
+	cameraRef.current = { x: position.x, y: position.y, z: position.z };
+	if (!playing) setCameraPos((prev) => Math.abs(prev.x - position.x) + Math.abs(prev.y - position.y) + Math.abs(prev.z - position.z) > 1e-4
+		? { x: position.x, y: position.y, z: position.z } : prev);
+	visibleRef.current = visible;
+	if (!playing) setSubjectVisible((prev) => (prev === visible ? prev : visible));
+}

package/src/stage-labels-ko.js

@@ -119,9 +119,6 @@ export const SCENE_RENDERER_LABELS_KO = new Map([
 	["cylinder", ko("cylinder", "원기둥")],
 	["cone", ko("cone", "원뿔")],
 	["plane", ko("plane", "평면")],
-	["chair", ko("chair", "의자")],
-	["car", ko("car", "자동차")],
-	["aircraft", ko("aircraft", "비행기")],
 	[CUTOUT_KIND, ko("cutout", "컷아웃")],
 	[MESH_KIND, ko("Mesh", "모델")],
 	["sculpt", ko("Sculpt", "조형")],
@@ -134,9 +131,6 @@ export const SCENE_OBJECT_NAME_LABELS_KO = new Map([
 	["Cylinder", ko("Cylinder", "원기둥")],
 	["Cone", ko("Cone", "원뿔")],
 	["Plane", ko("Plane", "평면")],
-	["Chair", ko("Chair", "의자")],
-	["Car", ko("Car", "자동차")],
-	["Plane (aircraft)", ko("Plane (aircraft)", "비행기")],
 	["Mesh", ko("Mesh", "모델")],
 	["Model", ko("Model", "모델")],
 ]);

package/src/stage-startup-defaults.js

@@ -32,16 +32,10 @@ export const SHOT_ASPECT_PRESETS = Object.freeze({
 	"12:7": Object.freeze({ label: "12:7", aspect: SHOT_ASPECT_RATIOS["12:7"], width: 1536, height: 896, title: "12:7 video-inbetweener ratio" }),
 	"fal 480P": Object.freeze({ label: "fal 480P", aspect: SHOT_ASPECT_RATIOS["fal 480P"], width: 1664, height: 960, title: "Fal H3 480P canvas (832x480)" }),
 });
-// Pre-generated clip shipped with the build so a bridge-less session (a hosted
-// static demo, or `npm run dev:ui`) still shows real generated motion.
-// Root-absolute on purpose: the studio is served from "/app/" while these
-// public files stay at the site root, so a page-relative path would resolve
-// to "/app/models/..." and 404. Vite's base is "/" (own apex domain), so a
-// leading slash is now the correct — and only — form that works from both
-// the dev server and the built site.
 // Per-character rig model: the stage entry's `model` is the FBX file stem in
-// public/models AND the wire rig name sent to ARDY, so mesh and export can
-// never drift apart.
+// public/models. Root-absolute on purpose: the studio is served from "/app/"
+// while public files stay at the site root, so a page-relative path would
+// resolve to "/app/models/..." and 404.
 export const characterModelUrl = (model) => `/models/${model}.fbx`;
 
 /** Shipped rig names as the operator says them, not as the files spell them. */

package/src/starter-scenes.js

@@ -1,15 +1,9 @@
-// Starter scenes ship inside the build (public/scenes/) so `npx cozyclay`
-// can open the same set the landing-page playground uses. The landing page
-// and the launcher refer to them by id; the studio resolves the id to the
-// same-origin file.
+// Starter scenes ship inside the build (public/scenes/<id>.cclayproject) and
+// are referred to by id: `npx cozyclay --scene <id>`, `?scene=<id>` and the
+// chooser's template cards. The build ships none today; an unknown id resolves
+// to null, and the studio ignores it.
 
-export const STARTER_SCENES = Object.freeze([
-	Object.freeze({
-		id: "city-block",
-		name: "City Block",
-		blurb: "The set from the cozyclay.org tutorial: an alley, parked cars, one character mid-walk.",
-	}),
-]);
+export const STARTER_SCENES = Object.freeze([]);
 
 function starterSceneById(id) {
 	return STARTER_SCENES.find((scene) => scene.id === id) ?? null;

package/src/studio-agent-commands.js

@@ -91,9 +91,9 @@ function basisAxis(spec, reference, state) {
 }
 function support(spec, state) {
   const id = spec.onObject ?? (typeof spec.support === 'object' ? spec.support.objectId : null);
-  if (!id) return { y: state.floorY, label: 'floor' };
+  if (!id) return { y: state.floorY ?? 0, label: 'floor' }; // live app state carries no floorY; the 3.0 floor is flat at 0
   const object = entityById(state, id);
-  if (!object.renderer || object.renderer === 'cutout' || ['sphere', 'capsule', 'cone', 'car', 'small-plane', 'empty', 'sculpt'].includes(object.renderer) || object.path || object.attach || Math.abs(object.rotX) > EPS || Math.abs(object.rotZ) > EPS || isEffectivelyHidden(object, state.objects, state.characters)) fail('TARGET_NOT_READY', 'Support must be a stationary solid upright surface.');
+  if (!object.renderer || object.renderer === 'cutout' || ['sphere', 'capsule', 'cone', 'empty', 'sculpt'].includes(object.renderer) || object.path || object.attach || Math.abs(object.rotX) > EPS || Math.abs(object.rotZ) > EPS || isEffectivelyHidden(object, state.objects, state.characters)) fail('TARGET_NOT_READY', 'Support must be a stationary solid upright surface.');
   return { y: object.y + supportHeightForObject(object) * object.scaleY, label: `object:${id}`, object };
 }
 function facingYaw(spec, entity, state) {

package/src/studio-agent-protocol.js

@@ -8,7 +8,6 @@ import { wrongType, unknownField, missingField, arrayRefusal, duplicateItem, str
 // both pull in three.js, which the agent sidecar must not load. The protocol test pins the lists to their owners.
 const PREVIS_MODES = ["storyboard", "animation"], POSTURES = ["stand", "sit", "lie"];
 
-export const STUDIO_PROTOCOL_VERSION = "studio-agent-v1";
 // Sized for the compact index of up to 400 entities (~100 bytes each) beside
 // 24 detailed rows; a small scene stays far below it.
 export const STUDIO_CONTEXT_MAX_BYTES = 64 * 1024;
@@ -30,7 +29,6 @@ export const STUDIO_TOOLS = Object.freeze(Object.keys(STUDIO_TOOL_LABELS));
 /** One patch target kind per authored commit domain: character→cast,
  * object→objects, shot→shot, stage→stage. */
 export const STUDIO_PATCH_KINDS = Object.freeze(["character", "object", "shot", "stage"]);
-export const STUDIO_PATCH_DOMAINS = Object.freeze({ character: "cast", object: "objects", shot: "shot", stage: "stage" });
 export { STUDIO_ERROR_CODES, refusalCode };
 export const STUDIO_VARIANTS = freezeStudioData({
 	selectionKinds: ["scene", "object", "character", "rig", "camera"], modes: ["scene", "pose", "camera", "motion"], shotModes: ["keys", "follow", "rail"],
@@ -47,7 +45,6 @@ export class StudioProtocolError extends Error {
 	constructor(code, message, details = {}) { super(message); this.name = "StudioProtocolError"; this.code = code; this.details = details; }
 	toJSON() { return { code: this.code, message: this.message, ...(Object.keys(this.details).length ? { details: this.details } : {}) }; }
 }
-export const studioError = (code, message, details) => ({ ok: false, error: new StudioProtocolError(code, message, details).toJSON() });
 export const utf8ByteLength = (text) => new TextEncoder().encode(text).byteLength;
 export function freezeStudioData(value) {
 	if (value && typeof value === "object" && !Object.isFrozen(value)) { for (const child of Object.values(value)) freezeStudioData(child); Object.freeze(value); }
@@ -302,8 +299,7 @@ const receiptVariants = {
 	installed: object({ ...authoredReceipt, status: literal("installed"), jobId: id, artifactId: id, installed, verification }, {
 		// Who accepted an unverified take: the user's explicit button, or the
 		// runtime's advisory install policy. Exactly these two may admit one.
-		mutated: literal(true), explicitUnverifiedAcceptance: bool, acceptance: literal("advisory-policy"),
-		repairs: object({ autoPhysicsInvocations: integer(0, 1), fixCollisionsInvocations: integer(0, 1), remaining: integer(0, 2) }), ...batchDetails,
+		mutated: literal(true), explicitUnverifiedAcceptance: bool, acceptance: literal("advisory-policy"), ...batchDetails,
 	}),
 	undone: object({ ...authoredReceipt, status: literal("undone"), undoneReceiptId: id, restoredTargets: array(guardSchema, 100, 1) }, { mutated: literal(true), ...batchDetails }),
 };
@@ -382,7 +378,6 @@ export function validateStudioSchema(schema, value, code = "INVALID_ARGUMENT", p
 	throw new Error("Unsupported internal Studio schema.");
 }
 export const validateStudioIdentity = value => validateStudioSchema(identity, value, "INVALID_IDENTITY");
-export const validateFrameRange = value => freezeStudioData(validateStudioSchema(range, value, "INVALID_RANGE"));
 
 export function mandatoryStudioTargetIds(context) {
 	return [...new Set([
@@ -544,6 +539,6 @@ export function validateReceipt(value) {
 		if (previous !== frameCount || r.installed.durationSeconds !== frameCount / 24 || r.verification.range.startFrame !== 0 || r.verification.range.endFrameExclusive !== frameCount || r.verification.evaluatedFrames > frameCount) fail("INVALID_RECEIPT", "Installed schedule and verification coverage disagree.");
 		if (r.verification.status === "verified" && r.verification.evaluatedFrames !== frameCount) fail("INVALID_RECEIPT", "Verified motion requires whole-clip coverage.");
 		if (r.verification.status === "unverified" && r.explicitUnverifiedAcceptance !== true && r.acceptance !== "advisory-policy") fail("INVALID_RECEIPT", "Unverified installation requires explicit user or advisory-policy acceptance.");
-	} else if (r.installed || r.verification || (r.jobId && !["started", "completed"].includes(r.status)) || r.artifactId || r.repairs || r.explicitUnverifiedAcceptance !== undefined) fail("INVALID_RECEIPT", "Installation evidence is exclusive to installed receipts.");
+	} else if (r.installed || r.verification || (r.jobId && !["started", "completed"].includes(r.status)) || r.artifactId || r.explicitUnverifiedAcceptance !== undefined) fail("INVALID_RECEIPT", "Installation evidence is exclusive to installed receipts.");
 	return freezeStudioData(r);
 }

package/src/studio-app-binding.js

@@ -228,7 +228,7 @@ export function createStudioAppBinding(ports) {
 	}
 	function runAction(request, args) {
 		const { name: _name, args: _args, ...options } = request;
-		const result = commandBus().run(args.action, args.args, { ...options, origin: "agent", turnId: request.turnId, confirmationToken: args.confirmationToken ?? request.confirmationToken });
+		const result = commandBus().run(args.action, args.args, { ...options, origin: "agent", turnId: request.turnId, taskId: request.taskId, confirmationToken: args.confirmationToken ?? request.confirmationToken });
 		const answer = receipt => receipt.nextHost ? { ...receipt, host: receipt.nextHost } : receipt;
 		return result?.then ? result.then(answer) : answer(result);
 	}

package/src/studio-elements.js

@@ -34,13 +34,17 @@ const entries = [
 	
 	{ path: "character.sessionMotion", type: "array", persisted: false, undoDomain: "cast", normalizer: "createCharacterEntry", note: "dropped by createCharacterEntry" },
 	{ path: "character.ikKeys", type: "array", persisted: false, undoDomain: "cast", normalizer: "createCharacterEntry", actions: ["character.setIkKey", "character.removeIkKey", "character.clearIkKeys"], note: "dropped by createCharacterEntry; keys travel as JSON quaternions/positions" },
-	{ path: "object.renderer", type: "enum", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", enum: ["cube", "sphere", "capsule", "cylinder", "cone", "plane", "chair", "car", "small-plane", "empty", "light", "effect", "text"], note: "light is made from catalogue kind point-light or spot-light; effect (smoke, fire, rain, trail...) from kind effect; text (words, a sign, a logo) from kind text" },
+	{ path: "object.renderer", type: "enum", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", enum: ["cube", "sphere", "capsule", "cylinder", "cone", "plane", "empty", "light", "effect", "text"], note: "light is made from catalogue kind point-light or spot-light; effect (smoke, fire, rain, trail...) from kind effect; text (words, a sign, a logo) from kind text" },
 	{ path: "object.position", type: "vec3", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", min: { x: -240, y: 0, z: -240 }, max: { x: 240, y: 240, z: 240 }, note: "y is the object's base: y=0 rests on the floor; height/supportY rise from it" },
 	{ path: "object.rotation", type: "vec3", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", min: { x: -180, y: -180, z: -180 }, max: { x: 180, y: 180, z: 180 }, angle: true, note: "rot/rotX/rotZ degrees, wrapped at the upper bound" },
 	{ path: "object.scale", type: "vec3", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", min: { x: 0.01, y: 0.01, z: 0.01 }, max: { x: 100, y: 100, z: 100 } },
 	{ path: "object.name", type: "string", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject" },
 	{ path: "object.color", type: "color", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject" },
-	{ path: "object.opacity", type: "number", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", min: 0.05, max: 1, note: "1 is solid; lower is see-through, e.g. 0.3 for clear glass" },
+	{ path: "object.opacity", type: "number", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", min: 0.05, max: 1, note: "1 is solid; lower is see-through, e.g. 0.4 for a ghost or water; for a glass object use object.material glass" },
+	// The preset names mirror material-presets.js MATERIAL_PRESETS / MATERIAL_FINISHES (test/verify-material-presets.mjs);
+	// sparse: a receipt lists them only on a record that has one.
+	{ path: "object.material", type: "enum", sparse: true, persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", enum: ["clay", "wood", "straw", "stone", "brick", "concrete", "metal", "glass", "ceramic", "plastic", "rubber", "fabric", "paper", "foliage"], note: "cube/sphere/capsule/cylinder/cone/plane only: surface preset with real texture and shine; color stays the tint and a grey (#c2c6c8) object takes the preset's own colour. clay is the default matte look; wood (planks, furniture), straw (thatch, hay, wicker), stone, brick (walls, chimneys), concrete (plaster, pavement), metal (reflects the stage), glass (clear, see-through; tint with color), ceramic (glazed), plastic, rubber (tyres), fabric (cloth, upholstery), paper, foliage (leaves, hedges)" },
+	{ path: "object.finish", type: "enum", sparse: true, persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", enum: ["matte", "satin", "gloss"], note: "with object.material: overrides the preset's shine, e.g. metal + gloss = chrome, glass + matte = frosted, wood + gloss = varnished" },
 	{ path: "object.parent", type: "id", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject" },
 	{ path: "object.attach", type: "id", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject", actions: ["object.attach", "object.detach"], note: "carried by a character's root or bone; channels convert so the prop stays put" },
 	{ path: "object.path", type: "array", persisted: true, undoDomain: "objects", normalizer: "normalizeSceneObject" },

package/src/styles/themes.css

@@ -13,6 +13,16 @@
 		--float-head: 48px;
 		--sans: -apple-system, BlinkMacSystemFont, "SF Pro Text", "IBM Plex Sans", "Pretendard", "Noto Sans KR", "Apple SD Gothic Neo", "Malgun Gothic", system-ui, "Segoe UI", Helvetica, Arial, sans-serif;
 		--mono: "SF Mono", ui-monospace, "JetBrains Mono", SFMono-Regular, Menlo, Consolas, monospace;
+		/* Shell popovers (project menu, dropdowns, Outliner context menu): one
+		   solid surface and one layer above every panel and rail. They are
+		   portaled to <body> and exclusive (src/popover.js), so the open one is
+		   always on top. The top bar's menus use the same layer. */
+		--z-popover: 90;
+		--popover-surface: var(--surface-raised);
+		--popover-border: var(--row-divider);
+		--popover-radius: var(--r-2, 6px);
+		--popover-blur: none;
+		--popover-shadow: 0 8px 24px rgba(0,0,0,.45);
 	}
 
 	/* Dark: the v2 surfaces with a deep clay-orange accent and shaded panels. */
@@ -73,6 +83,9 @@
 		--surface-bar: #f4f4f6;
 		--surface-panel: #f7f7f9;
 		--surface-raised: #ffffff;
+		--popover-surface: rgba(255,255,255,.96);
+		--popover-blur: blur(24px) saturate(1.6);
+		--popover-shadow: 0 10px 30px rgba(30,32,40,.16), 0 1px 3px rgba(30,32,40,.08);
 		--surface-active: #e4e4e9;
 		--field: #ececf0;
 		--field-deep: #e6e6eb;