ryugi-artifacts 1.18.4 → 1.20.0

package/dist/cli.cjs

@@ -922,7 +922,7 @@ async function main(argv) {
       }, emit);
     }
     if (command === "--version" || command === "-v") {
-      console.log("1.18.4");
+      console.log("1.20.0");
       return 0;
     }
     if (command === "--help" || command === "-h") {

package/dist/server.cjs

@@ -17633,7 +17633,8 @@ var BLOCK_TAGS2 = [
   "details",
   "footnote-section",
   "def",
-  "dynamic"
+  "dynamic",
+  "pending"
 ];
 var INLINE_TAGS2 = ["b", "strong", "i", "em", "u", "s", "del", "strike", "code", "sub", "sup", "mark", "a", "br", "footnote"];
 var DOCUMENT_TAGS = /* @__PURE__ */ new Set([...BLOCK_TAGS2, ...INLINE_TAGS2]);
@@ -17657,6 +17658,14 @@ var LITEXML_ONLY_TAGS = /* @__PURE__ */ new Set([
   "video"
 ]);
 var registry = createDefaultRegistry();
+registry.registerReader("pending", (el2) => {
+  const id2 = el2.getAttribute("id");
+  return { type: "pending", ...id2 ? { $: { blockId: id2 } } : {}, intent: el2.getAttribute("intent") ?? "", version: 1 };
+});
+registry.registerWriter("pending", (node) => {
+  const { $: state, intent } = node;
+  return { tag: "pending", attrs: { ...state?.blockId ? { id: state.blockId } : {}, intent: intent ?? "" }, selfClosing: true };
+});
 var DocumentRejected = class extends Error {
 };
 var URL_ATTR = /\surl\s*=\s*(?:"([^"]*)"|'([^']*)')/i;
@@ -17690,6 +17699,12 @@ function badDynamicProps(xml) {
   }
   return null;
 }
+function containsPending(value) {
+  if (Array.isArray(value)) return value.some(containsPending);
+  if (!value || typeof value !== "object") return false;
+  return value.type === "pending" || Object.values(value).some(containsPending);
+}
+var nestedPending = (blocks) => blocks.some((block) => block.type !== "pending" && containsPending(block)) ? "<pending> must be a top-level block" : null;
 function badDynamicUrl(nodes) {
   for (const node of nodes) {
     if (node.type === "dynamic" && !DYNAMIC_URL.test(node.url ?? "")) return "<dynamic> url must be assets/<name>.html";
@@ -17708,7 +17723,7 @@ function parseDocument2(xml) {
   } catch (err) {
     throw new DocumentRejected(err.message);
   }
-  const url = badDynamicUrl(state.root.children);
+  const url = badDynamicUrl(state.root.children) ?? nestedPending(state.root.children);
   if (url) throw new DocumentRejected(url);
   return state;
 }
@@ -17729,6 +17744,15 @@ function stampBlockIds(state) {
   });
   return { ...state, root: { ...state.root, children } };
 }
+var BOX_LINE = /[\u2500-\u257F]/;
+var TOP_LEFT = /[┌╭╔┏]/g;
+var BOTTOM_RIGHT = /[┘╯╝┛]/;
+var ARROW = /[▼▲▶◀►◄]|[─━]>/;
+var isBoxDiagram = (code) => code.split("\n").filter((line) => BOX_LINE.test(line)).length >= 3 && (code.match(TOP_LEFT)?.length ?? 0) >= 2 && BOTTOM_RIGHT.test(code) && ARROW.test(code);
+var holdsBoxDiagram = (node) => node.type === "code-block" && isBoxDiagram(node.code ?? "") || (node.children ?? []).some(holdsBoxDiagram);
+function boxDrawingDiagrams(state) {
+  return state.root.children.flatMap((block) => block.$?.blockId && holdsBoxDiagram(block) ? [block.$.blockId] : []);
+}
 
 // src/server/board-comments.ts
 var import_node_crypto2 = __toESM(require("node:crypto"), 1);
@@ -53451,6 +53475,10 @@ function streamAtVersion(doc, frontiers, createEditor3, base, target, commitMess
   };
 }
 
+// src/shared/document-features.ts
+var DOCUMENT_FEATURES = ["pending"];
+var DOCUMENT_FEATURES_HEADER = "x-ryugi-document-features";
+
 // node_modules/.pnpm/@lexical+table@0.52.0_typescript@5.9.3/node_modules/@lexical/table/dist/LexicalTable.dev.js
 var LexicalTable_dev_exports = {};
 __export(LexicalTable_dev_exports, {
@@ -87704,8 +87732,39 @@ var HeadlessExtension3 = mod45.HeadlessExtension;
 var createHeadlessEditor2 = mod45.createHeadlessEditor;
 
 // src/server/document-headless.ts
+var PendingNode = class _PendingNode extends DecoratorNode2 {
+  __intent;
+  static getType() {
+    return "pending";
+  }
+  static clone(node) {
+    return new _PendingNode(node.__intent, node.__key);
+  }
+  static importJSON(json) {
+    return new _PendingNode(json.intent).updateFromJSON(json);
+  }
+  constructor(intent = "", key2) {
+    super(key2);
+    this.__intent = intent;
+  }
+  exportJSON() {
+    return { ...super.exportJSON(), type: "pending", version: 1, intent: this.__intent };
+  }
+  createDOM() {
+    throw new Error("headless");
+  }
+  updateDOM() {
+    return false;
+  }
+  isInline() {
+    return false;
+  }
+  decorate() {
+    return null;
+  }
+};
 var createDocumentHeadlessEditor = () => createHeadlessEditor2({
-  nodes: allHeadlessNodes,
+  nodes: [...allHeadlessNodes, PendingNode],
   onError: (err) => {
     throw err;
   }
@@ -87713,6 +87772,8 @@ var createDocumentHeadlessEditor = () => createHeadlessEditor2({
 
 // src/server/document-session.ts
 var WRITTEN_LIMIT = 50;
+var OutdatedClient = class extends Error {
+};
 var messageOf = (err) => err instanceof Error ? err.message : String(err);
 function lcsLength(a5, b6) {
   const table = Array.from({ length: a5.length + 1 }, () => new Uint32Array(b6.length + 1));
@@ -87732,11 +87793,13 @@ function blockStats(before2, after2) {
   const changed = Math.min(added, removed);
   return `+${added - changed} ~${changed} -${removed - changed} blocks`;
 }
-function closestBase(written, text2, fallback) {
+function closestBase(written, text2, fallback, floor) {
+  const keys2 = [...written.keys()];
+  const from = floor === null ? -1 : keys2.indexOf(floor);
   const wanted = new Set(text2.split("\n").map((line) => line.trim()));
   let best = fallback;
   let bestScore = -1;
-  for (const candidate of written.keys()) {
+  for (const candidate of from >= 0 ? keys2.slice(from) : keys2) {
     const lines = candidate.split("\n").map((line) => line.trim());
     const shared = lines.filter((line) => wanted.has(line)).length;
     const score = shared - (lines.length - shared);
@@ -87747,6 +87810,15 @@ function closestBase(written, text2, fallback) {
   }
   return best;
 }
+async function lastAgentWrite(activityFile, file) {
+  const recorded = Number(await readText(activityFile));
+  if (recorded > 0) return recorded;
+  try {
+    return Math.round((await import_promises.default.stat(file)).mtimeMs);
+  } catch {
+    return Date.now();
+  }
+}
 async function readText(file) {
   try {
     return await import_promises.default.readFile(file, "utf8");
@@ -87789,10 +87861,15 @@ async function createDocumentSession(options) {
   let streaming = 0;
   let lastCursor = null;
   let lastGoodText = null;
+  let lastAgentText = null;
   let lastFileText = await readText(file) ?? "";
+  const activityFile = import_node_path8.default.join(import_node_path8.default.dirname(snapshotFile), "agent-active");
+  let agentActiveAt = await lastAgentWrite(activityFile, file);
+  let activitySaved = Promise.resolve();
+  const emitStatus = () => emit({ type: "status", outcome, streaming: streaming > 0, agentActiveAt });
   const setOutcome = (next) => {
     outcome = next;
-    emit({ type: "status", outcome, streaming: streaming > 0 });
+    emitStatus();
   };
   try {
     const initial = parseDocument2(lastFileText);
@@ -87833,6 +87910,9 @@ async function createDocumentSession(options) {
   const onFileText = (text2) => {
     if (text2 === lastFileText) return;
     lastFileText = text2;
+    agentActiveAt = Date.now();
+    const at7 = agentActiveAt;
+    activitySaved = activitySaved.then(() => writeAtomic(activityFile, String(at7))).catch((err) => log(`agent activity not saved: ${messageOf(err)}`));
     let target;
     try {
       target = parseDocument2(text2);
@@ -87842,13 +87922,15 @@ async function createDocumentSession(options) {
       return;
     }
     const fallback = lastGoodText ?? serializeDocument(editor.getEditorState().toJSON());
+    const floor = lastAgentText;
+    lastAgentText = text2;
     const queued = streaming > 0;
     lastGoodText = text2;
     streaming += 1;
-    emit({ type: "status", outcome, streaming: true });
+    emitStatus();
     playing = playing.then(async () => {
       try {
-        const baseText = queued ? fallback : closestBase(written, text2, fallback);
+        const baseText = queued ? fallback : closestBase(written, text2, fallback, floor);
         const { stats, steps } = prepareAgentEdit(baseText, text2, target);
         for (const step of steps) {
           applyStep(step);
@@ -87898,6 +87980,7 @@ async function createDocumentSession(options) {
       lastFileText = text2;
       lastGoodText = text2;
       remember(text2);
+      emit({ type: "saved" });
     }
     snapshotDirty = true;
     await saveSnapshot();
@@ -87920,8 +88003,13 @@ async function createDocumentSession(options) {
   scheduleWrite();
   return {
     snapshot: () => loro.export({ mode: "snapshot" }),
+    state: () => editor.getEditorState().toJSON(),
     lineage: () => loro.getTree(TREE_NAME).roots()[0]?.id ?? "",
-    importUpdate: (bytes) => {
+    importUpdate: (bytes, features = []) => {
+      const undeclared2 = DOCUMENT_FEATURES.filter((feature) => !features.includes(feature));
+      const types = undeclared2.length ? editor.getEditorState().read(() => new Set($getRoot2().getChildren().map((block) => block.getType()))) : /* @__PURE__ */ new Set();
+      const missing = undeclared2.filter((feature) => types.has(feature));
+      if (missing.length) throw new OutdatedClient(`this page cannot show <${missing.join(">, <")}> blocks; reload the page`);
       const probe = loro.fork();
       probe.import(bytes);
       if (probe.getTree(TREE_NAME).roots().length > 1) throw new Error("update belongs to a different document; reload the page");
@@ -87936,6 +88024,7 @@ async function createDocumentSession(options) {
     },
     outcome: () => outcome,
     streaming: () => streaming > 0,
+    agentActiveAt: () => agentActiveAt,
     cursor: () => lastCursor,
     settled: () => playing,
     flush,
@@ -87943,6 +88032,7 @@ async function createDocumentSession(options) {
       clearInterval(snapshotTimer);
       await flush();
       await saveSnapshot();
+      await activitySaved;
       binding.dispose();
       listeners.clear();
     }
@@ -87955,8 +88045,10 @@ var forAgent = (thread) => ({
   waitingOn: waitingOn(thread),
   messages: thread.messages.map(({ avatar: _avatar, ...message }) => message)
 });
-function outcomeWarnings(outcome, streaming) {
-  if (streaming) return [];
+var diagramWarnings = (session) => boxDrawingDiagrams(session.state()).map(
+  (id2) => `block ${id2} draws a diagram with box-drawing characters; this document is rendered, not Markdown, so draw it as <mermaid>`
+);
+function outcomeWarnings(outcome) {
   if (outcome.kind === "rejected") return [`agent edit rejected: ${outcome.message} (doc.xml is left as written; fix it)`];
   if (outcome.kind === "failed") return [`agent edit failed: ${outcome.message}`];
   return [];
@@ -87997,15 +88089,22 @@ function createDocumentRegistry(options) {
       warnings.set(id2, next);
       options.onWarningsChange(id2);
     };
-    setWarnings(outcomeWarnings(session.outcome(), false));
+    const currentWarnings = () => {
+      if (session.streaming()) return [];
+      const outcome = session.outcome();
+      return outcome.kind === "rejected" ? outcomeWarnings(outcome) : [...outcomeWarnings(outcome), ...diagramWarnings(session)];
+    };
+    setWarnings(currentWarnings());
     session.subscribe((event) => {
       if (event.type === "update") {
         options.broadcast({ type: "doc-update", artifact, bytes: Buffer.from(event.bytes).toString("base64") });
       } else if (event.type === "cursor") {
         options.broadcast({ type: "doc-cursor", artifact, cursor: event.cursor });
+      } else if (event.type === "saved") {
+        setWarnings(currentWarnings());
       } else {
-        options.broadcast({ type: "doc-status", artifact, streaming: event.streaming, outcome: event.outcome });
-        setWarnings(outcomeWarnings(event.outcome, event.streaming));
+        options.broadcast({ type: "doc-status", artifact, streaming: event.streaming, outcome: event.outcome, agentActiveAt: event.agentActiveAt, now: Date.now() });
+        setWarnings(currentWarnings());
       }
     });
     return session;
@@ -90347,6 +90446,8 @@ async function startArtifactsServer(options) {
     lineage: session.lineage(),
     outcome: session.outcome(),
     streaming: session.streaming(),
+    agentActiveAt: session.agentActiveAt(),
+    now: Date.now(),
     cursor: session.cursor(),
     comments: documents.comments(id2)
   });
@@ -90392,11 +90493,13 @@ async function startArtifactsServer(options) {
       send(res, 413, "Update too large");
       return;
     }
+    const header = req.headers[DOCUMENT_FEATURES_HEADER];
+    const features = typeof header === "string" ? header.split(",").map((feature) => feature.trim()) : [];
     try {
-      session.importUpdate(new Uint8Array(Buffer.concat(chunks)));
+      session.importUpdate(new Uint8Array(Buffer.concat(chunks)), features);
       send(res, 204, "");
     } catch (err) {
-      sendJson(res, 400, { error: err.message });
+      sendJson(res, err instanceof OutdatedClient ? 409 : 400, { error: err.message });
     }
   };
   const blockIdsOf = async (id2, dir) => {
@@ -90882,7 +90985,8 @@ async function startArtifactsServer(options) {
       const bytes = typeof request.bytes === "string" ? Buffer.from(request.bytes, "base64") : null;
       if (!bytes) throw new Error("update needs bytes");
       if (bytes.length > MAX_DOCUMENT_UPDATE) throw new Error("update too large");
-      session.importUpdate(new Uint8Array(bytes));
+      const features = Array.isArray(request.features) ? request.features.filter((feature) => typeof feature === "string") : [];
+      session.importUpdate(new Uint8Array(bytes), features);
       return null;
     }
     if (request.op === "comment") {
@@ -91079,7 +91183,7 @@ function openReady(payload) {
 }
 
 // package.json
-var version = "1.18.4";
+var version = "1.20.0";
 
 // src/server/main.ts
 async function main() {

package/dist/viewer/CloudDocument-fPJO17RB.js

@@ -0,0 +1 @@
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{a as r,m as i}from"./useSandboxFrame-Cx7xofoM.js";import{_ as a,d as o,g as s,h as c,t as l,u,v as d}from"./DocumentLayout-D4LN2imT.js";var f=e(t(),1),p=n();function m(){let e=(0,f.useMemo)(()=>window.matchMedia(`(prefers-color-scheme: dark)`),[]),[t,n]=(0,f.useState)(e.matches);return(0,f.useEffect)(()=>{let t=()=>n(e.matches);return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[e]),t}function h({id:e,state:t,contentBase:n,comments:h=i(),offline:g=!1}){let _=m(),[v,y]=(0,f.useState)(null),b=(0,f.useMemo)(()=>({artifact:`cloud/${e}`,contentBase:n,channel:s(),send:()=>void 0}),[e,n]),x=r(e,{comments:h.threads.filter(e=>e.status===`open`).length,activity:null,retrying:!1,reason:null});return(0,f.useEffect)(()=>{let e=document.createElement(`base`);return e.href=n,document.head.prepend(e),()=>e.remove()},[n]),(0,p.jsxs)(`div`,{className:`x1us19tq x1rozbrz xo2rkog`,className:`ryugi-doc ${{className:`x1us19tq x1rozbrz xo2rkog`}.className??``}`,children:[g?(0,p.jsxs)(`div`,{...{0:{className:`x78zum5 x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61`},1:{className:`x6s0dn4 x17d4w8g x1vqgdyp x4l9tsp x1bo0w0s xqfszdh xfifm61 x1s85apg x1ux6vrq`}}[!!x|0],children:[(0,p.jsx)(`i`,{className:`xci0xqf x1hagigm x16rqkct xxwmxtg`}),`电脑离线，暂时不能评论`]}):null,(0,p.jsx)(l,{editor:v,threads:h.threads,children:(0,p.jsx)(c.Provider,{value:b,children:(0,p.jsx)(d,{variant:`article`,theme:_?`dark`:`light`,initialValue:t,extraNodes:u,rendererConfig:o,onEditorReady:e=>{e?.setEditable(!1),y(e??null)},children:(0,p.jsx)(a,{})})})})]})}export{h as default};

package/dist/viewer/{CloudLiveDocument-DS85XF0L.js → CloudLiveDocument-cfa_fMZ_.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{a as r}from"./useSandboxFrame-3fuBOs0A.js";import{t as i}from"./index.js";import a from"./CloudDocument-CotgQhd8.js";import{DocumentView as o,t as s}from"./DocumentPage-0GGJlY-j.js";var c=e(t(),1),l=`1.18.4`,u=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function d(e,t){let n=u(e);return n!==null&&n===u(t)}var f=(e,t)=>`电脑上的 ryugi 是 ${t??`未知版本`}，网页是 ${e}，版本对上之前只能评论`,p=n();function m({id:e,state:t,contentBase:n,liveContentBase:u,comments:m}){let{transport:h,presence:g}=s(e,u??n??``),_=g?.online??!1;r(e,{online:g?.online??null});let[v,y]=(0,c.useState)(!1);if((0,c.useEffect)(()=>{_&&y(!0)},[_]),!h||!(v||_))return!t||!n?(0,p.jsx)(i,{children:g===null?`正在连接…`:`还没发布。电脑在线时，这里会实时显示。`}):(0,p.jsx)(a,{id:e,state:t,contentBase:n,comments:m,offline:g!==null&&!_});let b=_&&d(l,g?.version??null),x=_&&!b?f(l,g?.version??null):null;return(0,p.jsx)(o,{id:e,transport:h,live:_,cloud:{online:_,canEdit:b,reason:x}})}export{m as default};
+import{i as e}from"./rolldown-runtime-COiEfhsA.js";import{n as t,t as n}from"./jsx-runtime-CldxteV5.js";import{a as r}from"./useSandboxFrame-Cx7xofoM.js";import{t as i}from"./index.js";import a from"./CloudDocument-fPJO17RB.js";import{DocumentView as o,t as s}from"./DocumentPage-DU7AlIYi.js";var c=e(t(),1),l=`1.20.0`,u=e=>/^(\d+)\.(\d+)\./.exec(e??``)?.slice(1,3).join(`.`)??null;function d(e,t){let n=u(e);return n!==null&&n===u(t)}var f=(e,t)=>`电脑上的 ryugi 是 ${t??`未知版本`}，网页是 ${e}，版本对上之前只能评论`,p=n();function m({id:e,state:t,contentBase:n,liveContentBase:u,comments:m}){let{transport:h,presence:g}=s(e,u??n??``),_=g?.online??!1;r(e,{online:g?.online??null});let[v,y]=(0,c.useState)(!1);if((0,c.useEffect)(()=>{_&&y(!0)},[_]),!h||!(v||_))return!t||!n?(0,p.jsx)(i,{children:g===null?`正在连接…`:`还没发布。电脑在线时，这里会实时显示。`}):(0,p.jsx)(a,{id:e,state:t,contentBase:n,comments:m,offline:g!==null&&!_});let b=_&&d(l,g?.version??null),x=_&&!b?f(l,g?.version??null):null;return(0,p.jsx)(o,{id:e,transport:h,live:_,cloud:{online:_,canEdit:b,reason:x}})}export{m as default};