cozyclay 3.1.0 → 3.1.2

package/bin/agent/studio-tools.mjs

@@ -21,11 +21,12 @@ export function createStudioTools({ liveHub, workspaceHandle, session, resolveIm
   const rebaser = createRebaser({ session, liveHub, workspaceHandle, mutationNames, attempt: (name, args, scratch) => attempt(name, args, scratch) });
   // One admission attempt. `scratch` carries what the recovery path needs from
   // a refusal: the revision it was admitted at and the context re-read for it.
+  // scratch.callId: the model's tool call this command belongs to (a script's nested commands share the script's)
   const attempt = async (name, args, scratch = {}) => {
     const command = validateStudioCommand({ name, args });
     const action = name === "run_action" ? declared.get(command.args.action) : undefined;
     const payload = mutationNames.has(name) && session?.admission
-      ? { name, args: command.args, commandId: session.admission.commandId(), host: session.admission.host, expectedRevision: session.admission.revision, ...(session.admission.turnId ? { turnId: session.admission.turnId } : {}), ...(session.admission.taskId ? { taskId: session.admission.taskId } : {}) }
+      ? { name, args: command.args, commandId: session.admission.commandId(), host: session.admission.host, expectedRevision: session.admission.revision, ...(session.admission.turnId ? { turnId: session.admission.turnId } : {}), ...(session.admission.taskId ? { taskId: session.admission.taskId } : {}), ...(typeof scratch.callId === "string" && scratch.callId ? { callId: scratch.callId } : {}) }
       : command.args;
     Object.assign(scratch, { refusedRevision: payload.expectedRevision });
     let result;
@@ -64,7 +65,7 @@ export function createStudioTools({ liveHub, workspaceHandle, session, resolveIm
     return result;
   };
 	const availableTools = STUDIO_TOOLS;
-	const tools = availableTools.map(name => ({ ...schema(name), handler: args => rebaser.run(name, args) }));
+	const tools = availableTools.map(name => ({ ...schema(name), handler: (args, call = {}) => rebaser.run(name, args, call.callId ?? call.toolCallId) }));
   tools.resolveImage = async (imageId, correlation = {}) => {
     if (typeof resolveImage !== "function") return { visualStatus: "unavailable", reason: "image resolver unavailable" };
     try {

package/bin/agent/turn-frames.mjs

@@ -3,6 +3,7 @@
 // tool, and for run_action the action and its subject as soon as the streamed arguments name them). A long
 // motion spec or script takes the model many seconds to write; without these the panel could only say
 // "Thinking…". Frames only: nothing here reaches the model or the scene.
+import { createSculptSketch } from "./sculpt-sketch.mjs";
 
 const FLUSH_MS = 400;
 const MIN_BATCH = 16;
@@ -33,6 +34,8 @@ function composedCall(name, raw) {
 export function createReasoningFrames(push, clock = () => Date.now()) {
 	let thinking = "", flushedAt = clock();
 	const calls = new Map();
+	// The parts a call that builds sculpts has written so far, as sculpt.sketch frames (sculpt-sketch.mjs).
+	const sketch = createSculptSketch(push, clock);
 	const flush = () => {
 		if (!thinking) return;
 		push({ type: "thinking.delta", text: thinking });
@@ -42,6 +45,7 @@ export function createReasoningFrames(push, clock = () => Date.now()) {
 	return {
 		flush,
 		onMessageEvent(event) {
+			sketch.onMessageEvent(event);
 			if (event?.type === "thinking_delta") {
 				thinking += event.delta ?? "";
 				// a batch says something: not a lone word at the start of a paragraph

package/bin/cozyclay.mjs

@@ -26,6 +26,7 @@ import { openBrowser } from "./open-browser.mjs";
 import { checkForUpdate, readUpdateStatus, runUpdate } from "./update-check.mjs";
 import { handleOAuthRequest } from "./codex-auth.mjs";
 import { createAgentHandler } from "./agent/agent-routes.mjs";
+import { liveHubPort } from "./live-endpoint.mjs";
 import { verifyPackageMarker } from "./package-signature.mjs";
 import {
 	markTelemetryNoticeShown,
@@ -455,8 +456,9 @@ server = createServer((req, res) => {
 		// __COZYCLAY_LIVE__ opts the production build into the loopback live
 		// socket (src/App.jsx gates on DEV || this flag); without it an
 		// npx-served studio can never attach to the MCP server's live hub.
-		const script = `<script>window.__COZYCLAY_RUNTIME__ = ${JSON.stringify(runtime).replaceAll("<", "\\u003c")}; window.__COZYCLAY_LIVE__ = true;</script>`;
-		const html = readFileSync(target, "utf8").replace("</head>", `${script}\n</head>`);
+		// __COZYCLAY_LIVE_PORT__ tells the prebuilt bundle which hub port this
+		// launch chose (COZYCLAY_LIVE_PORT), since the build baked its own (#862).
+		const html = readFileSync(target, "utf8").replace("</head>", `<script>window.__COZYCLAY_RUNTIME__ = ${JSON.stringify(runtime).replaceAll("<", "\\u003c")}; window.__COZYCLAY_LIVE__ = true; window.__COZYCLAY_LIVE_PORT__ = ${JSON.stringify(liveHubPort())};</script>\n</head>`);
 		res.writeHead(200, {
 			"content-type": "text/html; charset=utf-8",
 			"content-length": Buffer.byteLength(html),

package/bin/live-endpoint.mjs

@@ -13,6 +13,8 @@ import { join } from "node:path";
 
 const liveDirectory = () => join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "cozyclay", "live");
 
+// The live hub port this launch uses; the served Studio is told the same port (#862).
+export const liveHubPort = (env = process.env) => Number(env.COZYCLAY_LIVE_PORT ?? 5184);
 export const liveEndpointPath = (port) => join(liveDirectory(), `${port}.json`);
 
 /** Ports this process published, so exit cleans up exactly its own files. */

package/dist/app/index.html

@@ -34,15 +34,15 @@
     <title>CozyClay Studio — 3D staging and previs in your browser</title>
 
     <script defer src="https://static.cloudflareinsights.com/beacon.min.js" data-cf-beacon='{"token": "6a4384d1375d4ffc8a30a6346a8ad1a0"}'></script>
-    <script type="module" crossorigin src="/assets/app-B2BpfCl2.js"></script>
+    <script type="module" crossorigin src="/assets/app-C4QTcDcb.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-hePW80VL.js">
     <link rel="modulepreload" crossorigin href="/assets/modulepreload-polyfill-P2Xu9kJm.js">
-    <link rel="modulepreload" crossorigin href="/assets/task-board-BKaM7d-9.js">
+    <link rel="modulepreload" crossorigin href="/assets/task-board-BqReHzOi.js">
     <link rel="modulepreload" crossorigin href="/assets/fflate.module-KbGj5-H6.js">
-    <link rel="modulepreload" crossorigin href="/assets/scene-asset-sync-CQzEdsqu.js">
-    <link rel="modulepreload" crossorigin href="/assets/motion3-compile-B887n77J.js">
-    <link rel="stylesheet" crossorigin href="/assets/scene-asset-sync-COGOlF5T.css">
-    <link rel="stylesheet" crossorigin href="/assets/app-BlwOpest.css">
+    <link rel="modulepreload" crossorigin href="/assets/scene-asset-sync-qoxcdrhj.js">
+    <link rel="modulepreload" crossorigin href="/assets/motion3-compile-dgGhrvPK.js">
+    <link rel="stylesheet" crossorigin href="/assets/scene-asset-sync-BEjjhNEo.css">
+    <link rel="stylesheet" crossorigin href="/assets/app-Bhe0TpGz.css">
   </head>
   <body>
     <div id="root">

package/dist/assets/{TaskBoard-DdDXMgZm.js → TaskBoard-GR8xZm5c.js}

@@ -1 +1 @@
-import{r as e}from"./rolldown-runtime-hePW80VL.js";import{Pr as t,c as n,d as r,f as i,l as a,m as o,o as s,v as c,xi as l}from"./task-board-BKaM7d-9.js";import{o as u,r as d,t as f}from"./motion3-compile-B887n77J.js";var p=e(l(),1),m=2e3,h=(e,t)=>new Promise(n=>{let r=setTimeout(n,e);t.addEventListener(`abort`,()=>{clearTimeout(r),n()},{once:!0})});function g(e,n){(0,p.useEffect)(()=>{let r=new Map;for(let[t,i]of Object.entries(e))for(let e of i)r.set(e,n[t]??t);let i=()=>{for(let e of document.querySelectorAll(`[data-node-id]`)){let n=r.get(e.getAttribute(`data-node-id`));n?(e.setAttribute(`data-task-scope`,n),e.setAttribute(`title`,t(`In task: ${n}`,`작업 중: ${n}`))):e.hasAttribute(`data-task-scope`)&&(e.removeAttribute(`data-task-scope`),e.removeAttribute(`title`))}};i();let a=new MutationObserver(i);return a.observe(document.body,{childList:!0,subtree:!0}),()=>{a.disconnect(),r.clear(),i()}},[e,n])}function _({sessionId:e,pulse:t,labelOf:l,onMainNote:_}){let v=(0,p.useMemo)(()=>s(),[]),y=u(),[b,x]=(0,p.useReducer)((e,t)=>t.seed?o(e,t.seed):t.reset?n():r(e,t.event),void 0,n),[S,C]=(0,p.useState)({}),[w,T]=(0,p.useState)(f),E=(0,p.useRef)(0),D=(0,p.useRef)(_);(0,p.useEffect)(()=>{E.current=b.after,D.current=_},[b.after,_]),(0,p.useEffect)(()=>{x({reset:!0}),E.current=0},[e]),(0,p.useEffect)(()=>d(T),[]),(0,p.useEffect)(()=>y.subscribe(e=>{typeof e?.type!=`string`||!e.type.startsWith(`task.`)||(C(t=>i(t,e)),(e.type===`task.userEdit`||e.type===`task.undone`)&&x({event:e}))}),[y]),(0,p.useEffect)(()=>{if(!e)return;let t=new AbortController;return(async()=>{for(;!t.signal.aborted;){try{let{tasks:n}=await v.board(e);x({seed:n}),await v.events(e,E.current,e=>{if(e.type===`main.turn`&&e.turnId){let n=``;v.frames(e.turnId,e=>{e.type===`text.delta`&&(n+=e.text??``),e.type===`tool.start`&&(n=``)},t.signal).then(()=>D.current?.(n),()=>{})}x({event:e})},t.signal)}catch{}await h(m,t.signal)}})(),()=>t.abort()},[v,e,t]);let O=b.order.filter(e=>b.tasks[e]?.status===`running`&&b.tasks[e]?.turnId),k=O.map(e=>`${e}:${b.tasks[e].turnId}`).join();return(0,p.useEffect)(()=>{let e=O.map(e=>{let t=new AbortController,{turnId:n}=b.tasks[e];return v.frames(n,t=>{let n=a(t,l);n&&x({event:{type:`task.progress`,taskId:e,status:`running`,progress:n}})},t.signal).catch(()=>{}),t});return()=>e.forEach(e=>e.abort())},[v,k,l]),g(S,(0,p.useMemo)(()=>Object.fromEntries(b.order.map(e=>[e,b.tasks[e].title])),[b])),(0,p.useEffect)(()=>{c.set({client:v,labelOf:l,undo:async e=>{let t=await y.run(`task.undo`,{taskId:e});if(t?.ok===!1)throw Error(t.message??t.code);x({event:{type:`task.undone`,taskId:e}})}})},[y,v,l]),(0,p.useEffect)(()=>{c.set({board:b,activity:w})},[b,w]),(0,p.useEffect)(()=>()=>c.set({board:n(),open:null}),[e]),null}export{_ as default};
+import{r as e}from"./rolldown-runtime-hePW80VL.js";import{c as t,d as n,da as r,f as i,l as a,m as o,o as s,v as c,wi as l}from"./task-board-BqReHzOi.js";import{o as u,r as d,t as f}from"./motion3-compile-dgGhrvPK.js";var p=e(r(),1),m=2e3,h=(e,t)=>new Promise(n=>{let r=setTimeout(n,e);t.addEventListener(`abort`,()=>{clearTimeout(r),n()},{once:!0})});function g(e,t){(0,p.useEffect)(()=>{let n=new Map;for(let[r,i]of Object.entries(e))for(let e of i)n.set(e,t[r]??r);let r=()=>{for(let e of document.querySelectorAll(`[data-node-id]`)){let t=n.get(e.getAttribute(`data-node-id`));t?(e.setAttribute(`data-task-scope`,t),e.setAttribute(`title`,l(`In task: ${t}`,`작업 중: ${t}`))):e.hasAttribute(`data-task-scope`)&&(e.removeAttribute(`data-task-scope`),e.removeAttribute(`title`))}};r();let i=new MutationObserver(r);return i.observe(document.body,{childList:!0,subtree:!0}),()=>{i.disconnect(),n.clear(),r()}},[e,t])}function _({sessionId:e,pulse:r,labelOf:l,onMainNote:_}){let v=(0,p.useMemo)(()=>s(),[]),y=u(),[b,x]=(0,p.useReducer)((e,r)=>r.seed?o(e,r.seed):r.reset?t():n(e,r.event),void 0,t),[S,C]=(0,p.useState)({}),[w,T]=(0,p.useState)(f),E=(0,p.useRef)(0),D=(0,p.useRef)(_);(0,p.useEffect)(()=>{E.current=b.after,D.current=_},[b.after,_]),(0,p.useEffect)(()=>{x({reset:!0}),E.current=0},[e]),(0,p.useEffect)(()=>d(T),[]),(0,p.useEffect)(()=>y.subscribe(e=>{typeof e?.type!=`string`||!e.type.startsWith(`task.`)||(C(t=>i(t,e)),(e.type===`task.userEdit`||e.type===`task.undone`)&&x({event:e}))}),[y]),(0,p.useEffect)(()=>{if(!e)return;let t=new AbortController;return(async()=>{for(;!t.signal.aborted;){try{let{tasks:n}=await v.board(e);x({seed:n}),await v.events(e,E.current,e=>{if(e.type===`main.turn`&&e.turnId){let n=``;v.frames(e.turnId,e=>{e.type===`text.delta`&&(n+=e.text??``),e.type===`tool.start`&&(n=``)},t.signal).then(()=>D.current?.(n),()=>{})}x({event:e})},t.signal)}catch{}await h(m,t.signal)}})(),()=>t.abort()},[v,e,r]);let O=b.order.filter(e=>b.tasks[e]?.status===`running`&&b.tasks[e]?.turnId),k=O.map(e=>`${e}:${b.tasks[e].turnId}`).join();return(0,p.useEffect)(()=>{let e=O.map(e=>{let t=new AbortController,{turnId:n}=b.tasks[e];return v.frames(n,t=>{let n=a(t,l);n&&x({event:{type:`task.progress`,taskId:e,status:`running`,progress:n}})},t.signal).catch(()=>{}),t});return()=>e.forEach(e=>e.abort())},[v,k,l]),g(S,(0,p.useMemo)(()=>Object.fromEntries(b.order.map(e=>[e,b.tasks[e].title])),[b])),(0,p.useEffect)(()=>{c.set({client:v,labelOf:l,undo:async e=>{let t=await y.run(`task.undo`,{taskId:e});if(t?.ok===!1)throw Error(t.message??t.code);x({event:{type:`task.undone`,taskId:e}})}})},[y,v,l]),(0,p.useEffect)(()=>{c.set({board:b,activity:w})},[b,w]),(0,p.useEffect)(()=>()=>c.set({board:t(),open:null}),[e]),null}export{_ as default};