cozyclay 1.9.0 → 2.0.0

package/mcp/mesh-file.mjs

@@ -0,0 +1,48 @@
+import { constants as fsConstants } from "node:fs";
+import { open as openFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { basename, join, resolve } from "node:path";
+
+import { ASSET_MAX_SOURCE_BYTES } from "../src/scene-assets.js";
+import { classifyMeshBytes, meshMimeForKind } from "../src/mesh-sniff.js";
+
+export function normalizeMeshPath(raw, { home = homedir() } = {}) {
+	if (typeof raw !== "string" || !raw.trim()) throw new Error("A file path is required.");
+	let path = raw.trim();
+	if (path.startsWith("file:")) {
+		try {
+			const url = new URL(path);
+			if (url.protocol === "file:") path = decodeURIComponent(url.pathname);
+		} catch {
+			path = path.replace(/^file:\/\//, "");
+		}
+	}
+	if (path === "~") path = home;
+	else if (path.startsWith("~/")) path = join(home, path.slice(2));
+	return resolve(path);
+}
+
+export async function readMeshFromPath(raw) {
+	const path = normalizeMeshPath(raw);
+	let file;
+	try {
+		file = await openFile(path, fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW);
+	} catch (error) {
+		throw new Error(`Could not read that file: ${error.message}`);
+	}
+	try {
+		const stat = await file.stat();
+		if (stat.isDirectory()) throw new Error("That path is a directory, not a 3D model.");
+		if (stat.size > ASSET_MAX_SOURCE_BYTES) {
+			throw new Error(`That model is too large to import — larger than ${Math.round(ASSET_MAX_SOURCE_BYTES / (1024 * 1024))} MB`);
+		}
+		const bytes = await file.readFile();
+		const kind = classifyMeshBytes(bytes);
+		if (kind === "fbx-old") throw new Error("That FBX file is too old to import");
+		const mimeType = meshMimeForKind(kind);
+		if (!kind || !mimeType) throw new Error("That file is not a 3D model");
+		return { path, name: basename(path), bytes, kind, mimeType };
+	} finally {
+		await file.close().catch(() => {});
+	}
+}

package/mcp/server.mjs

@@ -48,7 +48,7 @@ import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { ErrorCode, InitializeRequestSchema, LATEST_PROTOCOL_VERSION, McpError } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 
-import { LiveMutationUncertainError, MotionJobRegistry, startLiveHub } from "./live-hub.mjs";
+import { startLiveHub } from "./live-hub.mjs";
 import {
 	cleanupCaptureArtifacts,
 	createToolHandlers,
@@ -61,7 +61,6 @@ import {
 
 /* ------------------------------ process ---------------------------------- */
 
-const motionJobs = new MotionJobRegistry();
 sweepCaptureArtifacts();
 process.once("exit", cleanupCaptureArtifacts);
 for (const signal of ["SIGINT", "SIGTERM"]) process.once(signal, () => { cleanupCaptureArtifacts(); process.exit(128 + (signal === "SIGINT" ? 2 : 15)); });
@@ -71,73 +70,6 @@ const projectRootPromise = realpath(configuredProjectRoot).then((root) => {
 	return root;
 });
 
-/* ----------------------------- motion jobs ------------------------------- */
-
-const motionJobEvent = (job) => ({
-	...motionJobs.task(job),
-	...(job.outcome === null ? {} : { outcome: job.outcome }),
-});
-
-const sendMotionJobEvent = (job) => {
-	try {
-		if (liveHub?.sendEvent(job.workspaceId, "motion_job", motionJobEvent(job)) > 0) {
-			job.deliveredWorkspaceIds.add(job.workspaceId);
-		}
-	} catch (error) {
-		console.error(`[motion_job] lifecycle event delivery failed: ${error instanceof Error ? error.message : String(error)}`);
-	}
-};
-
-const publishMotionJob = async (job) => {
-	if (job.deliveredWorkspaceIds.has(job.workspaceId)) return;
-	const outcome = job.outcome;
-	if (!liveHub || job.status !== "completed" || typeof outcome?.motionUrl !== "string") {
-		sendMotionJobEvent(job);
-		return;
-	}
-	const installationState = job.installationStates.get(job.workspaceId);
-	if (installationState === "installing") return;
-	if (installationState === "installed") {
-		sendMotionJobEvent(job);
-		return;
-	}
-	const handle = liveHub.handleForWorkspaceId(job.workspaceId);
-	if (!handle) return;
-	job.installationStates.set(job.workspaceId, "installing");
-	try {
-		await liveHub.command("load_motion", {
-			url: outcome.motionUrl,
-			prompt: outcome.prompt ?? "",
-			blocks: outcome.blocks ?? [],
-			drop: outcome.drop ?? null,
-			characterId: outcome.targetCharacterId,
-		}, handle);
-	} catch (error) {
-		const uncertain = error instanceof LiveMutationUncertainError;
-		job.installationStates.set(job.workspaceId, uncertain ? "uncertain" : "failed");
-		motionJobs.transition(job, "failed", {
-			message: uncertain
-				? "The editor connection was lost while installing the completed take. Installation may have applied, so it will not be retried."
-				: `The editor rejected the completed take: ${error instanceof Error ? error.message : String(error)}`,
-		});
-		sendMotionJobEvent(job);
-		return;
-	}
-	job.installationStates.set(job.workspaceId, "installed");
-	// Generation already succeeded. Application is a separate, acknowledged
-	// editor mutation; rejected or uncertain installation never reaches here.
-	job.motionRequest?.apply();
-	sendMotionJobEvent(job);
-};
-
-const cancelMotionJob = ({ workspaceId, payload }) => {
-	if (typeof payload.taskId !== "string") return;
-	const task = motionJobs.cancel(payload.taskId, workspaceId);
-	if (!task) return;
-	const job = motionJobs.jobs.get(task.taskId);
-	if (job) void publishMotionJob(job);
-};
-
 /* ------------------------------- server ---------------------------------- */
 
 /** Tool registrations are counted as they happen so the HTTP status page can
@@ -152,7 +84,9 @@ const server = new McpServer(
 			"vocabulary (shot size, angle, lens) and render it into an AI image/video prompt. " +
 			"Call describe_scene first to see the current state. Coordinates are metres: x is right, " +
 			"z is toward the camera's default position, y is height above the floor. Rotations are " +
-			"degrees of yaw. Save with save_project to a .cclayproject file the CozyClay studio opens.",
+			"degrees of yaw. Save with save_project to a .cclayproject file the CozyClay studio opens. " +
+			"With an editor connected, studio_commands lists every command it registers and studio_run runs one " +
+			"through the editor's own command bus, answering its receipt.",
 	},
 );
 server.server.setRequestHandler(InitializeRequestSchema, async (request) => {
@@ -213,7 +147,7 @@ const serveRegistryTool = (name, args, workspaceHandle) => {
 // The tools themselves live in tool-handlers.mjs so an in-process agent can run
 // them without an MCP server; registration order is the registry's order, which
 // is the order tools/list reports.
-for (const handler of createToolHandlers({ projectRootPromise, motionJobs, publishMotionJob })) registerTool(handler);
+for (const handler of createToolHandlers({ projectRootPromise })) registerTool(handler);
 
 /* -------------------------------- start ---------------------------------- */
 
@@ -234,12 +168,7 @@ const configureLiveHub = (hub, token) => {
 	// only place its token exists.
 	publishLiveEndpoint({ port: hub.port, token, owner: "mcp" });
 	hub.server?.once("close", () => removeLiveEndpoint(hub.port));
-	hub.onEvent = ({ workspaceId, name, payload }) => {
-		if (name === "motion_job_cancel") cancelMotionJob({ workspaceId, payload });
-	};
-	hub.onWorkspaceConnected = ({ workspaceId }) => {
-		for (const job of motionJobs.forWorkspace(workspaceId)) void publishMotionJob(job);
-	};
+
 };
 
 // stdio is the default because that is how an MCP client launches a local