ryugi-artifacts 1.9.1 → 1.10.1

package/dist/cli.cjs

@@ -64,6 +64,7 @@ function projectPaths(dir) {
     lock: import_node_path.default.join(state, "start.lock")
   };
 }
+var invocation = () => process.env.RYUGI_ARTIFACTS_COMMAND || "ryugi-artifacts";
 var ARTIFACT_PATTERN = /^(artboard|document|html)\/[a-z0-9][a-z0-9-]*$/;
 var ARTIFACT_ERROR = "--artifact must be <type>/<id>: type artboard, document or html, id of lowercase letters, digits and hyphens";
 
@@ -148,9 +149,14 @@ function commandLine(pid) {
   const line = full.stdout.split("\n").slice(1).join(" ").trim();
   return line ? line.split(/\s+/) : null;
 }
+var isNodeImage = (tasklistLine) => /^"node\.exe"/i.test(tasklistLine.trim());
+function windowsNodeAt(pid) {
+  const result = (0, import_node_child_process.spawnSync)("tasklist", ["/FI", `PID eq ${pid}`, "/FO", "CSV", "/NH"], { encoding: "utf8", windowsHide: true });
+  return result.status === 0 && isNodeImage(result.stdout);
+}
 function hasServerId(pid, id) {
   if (!alive(pid)) return false;
-  if (process.platform === "win32") return true;
+  if (process.platform === "win32") return windowsNodeAt(pid);
   return commandLine(pid)?.includes(`--artifacts-server-id=${id}`) ?? false;
 }
 function parentOf(pid) {
@@ -230,7 +236,7 @@ function recordAgent(paths) {
   if (Object.keys(markers).length) import_node_fs3.default.writeFileSync(paths.agent, `${JSON.stringify(markers)}
 `);
 }
-async function replace(pid) {
+async function replace(pid, paths) {
   try {
     process.kill(pid, "SIGTERM");
   } catch {
@@ -241,7 +247,7 @@ async function replace(pid) {
   } catch {
   }
   if (await waitForExit(pid, 2e3)) return;
-  throw new CliError(`The running server (pid ${pid}) is on another release and did not stop; stop it with \`ryugi-artifacts stop\` and retry`);
+  throw new CliError(`The running server (pid ${pid}) is on another release and did not stop; stop it with \`${invocation()} stop --project-dir ${paths.project}\` and retry`);
 }
 function serverEnv(paths, options) {
   const env = { ...process.env, ARTIFACTS_ROOT: paths.root, ARTIFACTS_HOST: options.host, ARTIFACTS_URL_HOST: options.urlHost, ARTIFACTS_OPEN: options.open ? "1" : "0" };
@@ -249,6 +255,7 @@ function serverEnv(paths, options) {
   if (options.idleTimeoutMinutes) env.ARTIFACTS_IDLE_TIMEOUT_MS = String(Number(options.idleTimeoutMinutes) * 6e4);
   delete env.RYUGI_ARTIFACTS_OWNER;
   delete env.RYUGI_ARTIFACTS_VERSION;
+  delete env.RYUGI_ARTIFACTS_COMMAND;
   return env;
 }
 async function start(options, emit) {
@@ -282,7 +289,7 @@ async function start(options, emit) {
         emit(withLink(JSON.parse(info), options.artifact, true));
         return 0;
       }
-      await replace(running);
+      await replace(running, paths);
     }
     registerOwner(paths);
     recordAgent(paths);
@@ -326,7 +333,7 @@ async function start(options, emit) {
       const started = lines.find((line) => line.includes('"server-started"'));
       if (started) {
         for (let check = 0; check < 20; check++) {
-          if (!alive(child.pid)) throw new CliError(`Server started but was killed. Retry in a persistent terminal with: ryugi-artifacts start --project-dir ${paths.project} --host ${options.host} --url-host ${options.urlHost} --foreground`);
+          if (!alive(child.pid)) throw new CliError(`Server started but was killed. Retry in a persistent terminal with: ${invocation()} start --project-dir ${paths.project}${options.artifact ? ` --artifact ${options.artifact}` : ""} --host ${options.host} --url-host ${options.urlHost} --foreground`);
           await sleep(100);
         }
         emit(withLink(JSON.parse(started), options.artifact, false));
@@ -346,7 +353,7 @@ async function start(options, emit) {
 }
 
 // src/cli/publish.ts
-var NOT_RUNNING = "No artifacts server is running for this project. Start it with `ryugi-artifacts start`, then run this again.";
+var notRunning = (project) => `No artifacts server is running for this project. Start it with \`${invocation()} start --project-dir ${project}\`, then run this again.`;
 async function publish(options, emit) {
   if (options.action === "publish" || options.action === "unpublish") {
     if (!options.artifact) throw new CliError("--artifact <type>/<id> is required");
@@ -358,7 +365,7 @@ async function publish(options, emit) {
   try {
     info = JSON.parse(readText(paths.info) ?? "");
   } catch {
-    throw new CliError(NOT_RUNNING);
+    throw new CliError(notRunning(paths.project));
   }
   const base = new URL(info.url);
   const key = base.searchParams.get("key") ?? "";
@@ -372,7 +379,7 @@ async function publish(options, emit) {
         body: body ? JSON.stringify(body) : void 0
       });
     } catch {
-      throw new CliError(NOT_RUNNING);
+      throw new CliError(notRunning(paths.project));
     }
     const json = await res.json().catch(() => ({}));
     if (res.status === 401) throw new CliError("", { type: "login-required", url: json.loginUrl, message: "Open url to sign in to the Ryugi cloud, then run the same command again." }, 2);
@@ -569,7 +576,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.9.1");
+      console.log("1.10.1");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -1975,6 +1975,16 @@ function structuralWarnings(raw) {
   if (raw.building !== void 0 && typeof raw.building !== "boolean") {
     warnings.push('"building" must be a boolean');
   }
+  if (raw.writing !== void 0 && (typeof raw.writing !== "string" || !raw.writing)) {
+    warnings.push('"writing" must be a board id');
+  }
+  if (isObject2(raw.notes)) {
+    for (const [id2, note] of Object.entries(raw.notes)) {
+      if (isObject2(note) && note.color !== void 0 && (typeof note.color !== "string" || !/^#(?:[\da-f]{3}|[\da-f]{6})$/i.test(note.color))) {
+        warnings.push(`note "${id2}" color must be #RGB or #RRGGBB`);
+      }
+    }
+  }
   if (isObject2(raw.boards)) {
     for (const [id2, board] of Object.entries(raw.boards)) {
       if (isObject2(board) && board.interactive !== void 0 && typeof board.interactive !== "boolean") {
@@ -2083,6 +2093,9 @@ function validateCanvas(raw, fileExists, options = {}) {
     warnings.push(`activePage "${canvas.activePage}" is not a page`);
   }
   const target = canvas.focus?.target;
+  if (canvas.writing !== void 0 && !canvas.boards[canvas.writing]) {
+    warnings.push(`writing target "${canvas.writing}" is not a board`);
+  }
   if (target !== void 0 && !canvas.boards[target] && !canvas.groups?.[target] && !canvas.notes?.[target]) {
     warnings.push(`focus target "${target}" is not a board, group or note`);
   }
@@ -83771,12 +83784,14 @@ async function createDocumentSession(options) {
       setOutcome({ kind: "rejected", message: messageOf(err) });
       return;
     }
-    const baseText = closestBase(written, text2, lastGoodText ?? serializeDocument(editor.getEditorState().toJSON()));
+    const fallback = lastGoodText ?? serializeDocument(editor.getEditorState().toJSON());
+    const queued = streaming > 0;
     lastGoodText = text2;
     streaming += 1;
     emit({ type: "status", outcome, streaming: true });
     playing = playing.then(async () => {
       try {
+        const baseText = queued ? fallback : closestBase(written, text2, fallback);
         const { stats, steps } = prepareAgentEdit(baseText, text2, target);
         for (const step of steps) {
           applyStep(step);
@@ -85686,12 +85701,13 @@ async function startArtifactsServer(options) {
     for (const socket of clients) socket.write(frame);
   };
   const avatars = createAvatars(options.fetch);
+  const names = commentNames({ agentFile: import_node_path16.default.join(stateDir, "agent"), projectDir: import_node_path16.default.resolve(root, "../.."), cloud: options.cloud });
   const documents = createDocumentRegistry({
     root,
     stateDir,
     timing: options.documentTiming,
     broadcast,
-    names: commentNames({ agentFile: import_node_path16.default.join(stateDir, "agent"), projectDir: import_node_path16.default.resolve(root, "../.."), cloud: options.cloud }),
+    names,
     onWarningsChange: (id2) => {
       const dir = resolveArtifactDir(root, "document", id2);
       if (!dir) return;
@@ -85708,6 +85724,9 @@ async function startArtifactsServer(options) {
     const payload = readArtifact(dir, ref, runtimeOf(ref, dir));
     const reasons = [...payload.warnings];
     if ("pending" in payload) reasons.push(...payload.pending.map((board) => `board ${board} is still being written`));
+    if ("canvas" in payload && payload.canvas?.writing && !payload.pending.includes(payload.canvas.writing)) {
+      reasons.push(`board ${payload.canvas.writing} is still being written`);
+    }
     if (session?.streaming()) reasons.push("the document is still being written");
     const title = titleOf(payload, ref);
     let published = null;
@@ -85849,7 +85868,7 @@ async function startArtifactsServer(options) {
       return;
     }
     const ref = artifactKeyOf(`${type}/${id2}`);
-    sendJson(res, 200, { ...readArtifact(dir, ref, runtimeOf(ref, dir)), contentBase: `${contentPrefix}${type}/${id2}/` });
+    sendJson(res, 200, { ...readArtifact(dir, ref, runtimeOf(ref, dir)), ...ref.type !== "html" ? { agent: names.agent() } : {}, contentBase: `${contentPrefix}${type}/${id2}/` });
   };
   const serveList = (res) => {
     const { artifacts, warnings } = listArtifacts(root);
@@ -86199,6 +86218,7 @@ function openReady(payload) {
   if (!canvas || payload.warnings.length > 0) return false;
   const boards = Object.entries(canvas.boards);
   if (boards.length === 0) return false;
+  if (canvas.building === true) return true;
   const pending = new Set(payload.pending);
   const ready = (id2) => {
     const board = canvas.boards[id2];

package/dist/viewer/{CloudDocument-Dguokp_6.js → CloudDocument-DHt_mVdQ.js}

@@ -1 +1 @@
-import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{c as r,l as i,n as a,o,r as s,s as c}from"./DocumentEditor-rRoUyzj5.js";var l=e(t(),1),u=n();function d(){let e=(0,l.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,l.useState)(e.matches);return(0,l.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function f({id:e,state:t,contentBase:n}){let f=d(),p=(0,l.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:c(),send:()=>void 0}),[e,n]);return(0,l.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,u.jsx)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:(0,u.jsx)(`article`,{className:`xrgej4m xvueqy4 x1axd487 x4l9tsp`,children:(0,u.jsx)(o.Provider,{value:p,children:(0,u.jsx)(i,{variant:`article`,theme:f?`dark`:`light`,initialValue:t,extraNodes:a,rendererConfig:s,onEditorReady:e=>e?.setEditable(!1),children:(0,u.jsx)(r,{})})})})})}export{f as default};
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{c as r,l as i,n as a,o,r as s,s as c}from"./DocumentEditor-CHFJtV6u.js";var l=e(t(),1),u=n();function d(){let e=(0,l.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,l.useState)(e.matches);return(0,l.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function f({id:e,state:t,contentBase:n}){let f=d(),p=(0,l.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:c(),send:()=>void 0}),[e,n]);return(0,l.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,u.jsx)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:(0,u.jsx)(`article`,{className:`xrgej4m xvueqy4 x1axd487 x4l9tsp`,children:(0,u.jsx)(o.Provider,{value:p,children:(0,u.jsx)(i,{variant:`article`,theme:f?`dark`:`light`,initialValue:t,extraNodes:a,rendererConfig:s,onEditorReady:e=>e?.setEditable(!1),children:(0,u.jsx)(r,{})})})})})}export{f as default};