ryugi-artifacts 1.52.0 → 1.53.0

package/dist/cli.cjs

@@ -5617,7 +5617,16 @@ function detectAgent(env) {
 }
 
 // src/cli/comment.ts
-var COMMENT_ACTIONS = ["list", "add", "reply", "resolve", "choose", "submit"];
+var COMMENT_ACTIONS = [
+  "list",
+  "add",
+  "reply",
+  "resolve",
+  "choose",
+  "submit",
+  "pass",
+  "reject"
+];
 var ARTIFACT = /^(?:document|artboard)\/[a-z0-9][a-z0-9-]*$/;
 var WRITTEN = {
   add: "comment-added",
@@ -5625,6 +5634,7 @@ var WRITTEN = {
   resolve: "comment-resolved"
 };
 var RECORDED = { choose: "choice-recorded", submit: "round-submitted" };
+var VERDICTS = /* @__PURE__ */ new Set(["pass", "reject"]);
 function readStdin() {
   if (process.stdin.isTTY) return "";
   try {
@@ -5646,8 +5656,22 @@ function coordinate(value, flag) {
 }
 function requestOf(options, action, type) {
   if (action === "list") return { op: "list", all: !!options.all };
-  if ((action === "choose" || action === "submit") && type !== "artboard")
+  if ((action === "choose" || action === "submit" || VERDICTS.has(action)) && type !== "artboard")
     throw new CliError(`comment ${action} works on artboards only`);
+  if (action === "pass" || action === "reject") {
+    const all = action === "pass" && !!options.all;
+    if (!all && !options.group)
+      throw new CliError(
+        action === "pass" ? "comment pass needs --group <groupId>, or --all" : "comment reject needs --group <groupId>"
+      );
+    const text2 = action === "reject" ? messageText(options) : options.text?.trim();
+    return {
+      op: "verdict",
+      verdict: action,
+      ...all ? { all: true } : { group: options.group },
+      ...text2 ? { text: text2 } : {}
+    };
+  }
   if (action === "choose") {
     if (!options.group) throw new CliError("comment choose needs --group <groupId>");
     if (!options.clear && !options.board)
@@ -5685,7 +5709,9 @@ function requestOf(options, action, type) {
 async function comment(options, emit) {
   const action = COMMENT_ACTIONS.find((name) => name === options.action);
   if (!action)
-    throw new CliError("comment needs an action: list, add, reply, resolve, choose or submit");
+    throw new CliError(
+      "comment needs an action: list, add, reply, resolve, choose, submit, pass or reject"
+    );
   if (!options.artifact || !ARTIFACT.test(options.artifact))
     throw new CliError("--artifact must be document/<id> or artboard/<id>");
   const [type, id] = options.artifact.split("/");
@@ -5711,6 +5737,14 @@ async function comment(options, emit) {
       ...json.rounds ? { rounds: json.rounds } : {},
       ...options.all ? { all: true } : {}
     });
+  else if (action === "pass" || action === "reject")
+    emit({
+      type: "verdict-recorded",
+      artifact: options.artifact,
+      verdict: action,
+      groups: json.groups,
+      threadIds: json.threadIds
+    });
   else if (action === "choose")
     emit({
       type: RECORDED.choose,
@@ -5749,7 +5783,7 @@ var VERDICT_TEXT = { pass: "passed", reject: "rejected", pending: "waiting for a
 var plural = (count, word) => `${count} ${word}${count === 1 ? "" : "s"}`;
 function groupText(group) {
   const parts = [
-    VERDICT_TEXT[group.verdict],
+    `${VERDICT_TEXT[group.verdict]}${group.by === "agent" && group.verdict !== "pending" ? " by the agent" : ""}`,
     group.evidenceUpdated ? "evidence replaced since the last verdict" : "",
     group.rejectThreads ? `${plural(group.rejectThreads, "open reject thread")}` : ""
   ];
@@ -5816,6 +5850,11 @@ ${rounds.map(roundText).join("\n")}` : ""
   if (value.type === "comment-resolved") return `Resolved thread ${value.threadId}`;
   if (value.type === "choice-recorded")
     return value.board ? `Recorded ${value.board} for ${value.group}` : `Cleared the choice in ${value.group}`;
+  if (value.type === "verdict-recorded") {
+    const groups = value.groups;
+    if (!groups.length) return `Every verify group on ${value.artifact} has already passed`;
+    return `${value.verdict === "pass" ? "Passed" : "Rejected"} ${groups.join(", ")}`;
+  }
   if (value.type === "round-submitted")
     return `${value.submitted ? "Submitted" : "Withdrew"} round ${value.round}`;
   return null;
@@ -5830,12 +5869,17 @@ var commentCommand = {
     "reply   --artifact <document|artboard>/<id> --thread <threadId> [--text <text>]",
     "resolve --artifact <document|artboard>/<id> --thread <threadId>",
     "choose  --artifact artboard/<id> --group <groupId> (--board <boardId> | --clear)",
-    "submit  --artifact artboard/<id> --round <roundId> [--withdraw]"
+    "submit  --artifact artboard/<id> --round <roundId> [--withdraw]",
+    "pass    --artifact artboard/<id> (--group <groupId> | --all) [--text <text>]",
+    "reject  --artifact artboard/<id> --group <groupId> [--text <text>]"
   ],
-  details: "list prints what changed since you last listed. Without --text, add and reply read the message from stdin.",
+  details: "list prints what changed since you last listed. Without --text, add, reply and reject read the message from stdin. pass and reject record a verdict on a verify group only when your human partner asks for it; the board shows the agent recorded it.",
   options: {
     artifact: { type: "string", value: "<type>/<id>", help: "The document or artboard" },
-    all: { type: "boolean", help: "list: every thread, not only what changed" },
+    all: {
+      type: "boolean",
+      help: "list: every thread, not only what changed; pass: every verify group not yet passed"
+    },
     block: { type: "string", value: "<blockId>", help: "add: the document block to comment on" },
     quote: {
       type: "string",
@@ -5846,8 +5890,16 @@ var commentCommand = {
     x: { type: "string", value: "<px>", help: "add: horizontal position on the board" },
     y: { type: "string", value: "<px>", help: "add: vertical position on the board" },
     thread: { type: "string", value: "<threadId>", help: "reply, resolve: the thread" },
-    text: { type: "string", value: "<text>", help: "add, reply: the message" },
-    group: { type: "string", value: "<groupId>", help: "choose: the choice group" },
+    text: {
+      type: "string",
+      value: "<text>",
+      help: "add, reply: the message; reject: the reason; pass: an optional note"
+    },
+    group: {
+      type: "string",
+      value: "<groupId>",
+      help: "choose: the choice group; pass, reject: the verify group"
+    },
     clear: { type: "boolean", help: "choose: clear the choice instead of naming a board" },
     round: { type: "string", value: "<roundId>", help: "submit: the round" },
     withdraw: { type: "boolean", help: "submit: withdraw the submission" }
@@ -18980,7 +19032,7 @@ async function start(options, emit) {
   import_node_fs13.default.mkdirSync(paths.state, { recursive: true });
   if (!import_node_fs13.default.existsSync(import_node_path12.default.join(paths.state, ".gitignore")))
     import_node_fs13.default.writeFileSync(import_node_path12.default.join(paths.state, ".gitignore"), "*\n");
-  const cliVersion = process.env.RYUGI_ARTIFACTS_VERSION || (true ? "1.52.0" : "");
+  const cliVersion = process.env.RYUGI_ARTIFACTS_VERSION || (true ? "1.53.0" : "");
   const known = readProjects(machine.projects).some((entry) => entry.dir === paths.project);
   const finish = async (info, reused, hint) => {
     recordAgent(paths);
@@ -19081,6 +19133,10 @@ async function start(options, emit) {
       });
       return await exited;
     }
+    try {
+      import_node_fs13.default.renameSync(machine.log, `${machine.log}.1`);
+    } catch {
+    }
     const log = import_node_fs13.default.openSync(machine.log, "w");
     const child = (0, import_node_child_process3.spawn)(process.execPath, args, {
       env,
@@ -19436,7 +19492,7 @@ var updateCommand = {
   },
   run: ({ values }, emit) => update2(
     {
-      current: "1.52.0",
+      current: "1.53.0",
       file: __filename,
       env: process.env,
       registry: process.env.npm_config_registry || "https://registry.npmjs.org/",
@@ -19516,7 +19572,7 @@ async function main(argv) {
   const [name, ...rest] = argv;
   const command = COMMANDS.find((candidate) => candidate.name === name);
   const json = argv.includes("--json") || !command?.explicitJson && !process.stdout.isTTY;
-  notifyUpdate("1.52.0", json, argv);
+  notifyUpdate("1.53.0", json, argv);
   const emit = (value) => {
     const line = json ? JSON.stringify(value) : text(value);
     if (!json && typeof value.error === "string") console.error(line);
@@ -19535,7 +19591,7 @@ async function main(argv) {
       return await command.run(parse(rest, command.options, command.positionals), emit);
     }
     if (name === "--version" || name === "-v") {
-      console.info("1.52.0");
+      console.info("1.53.0");
       return 0;
     }
     if (name === "--help" || name === "-h") {

package/dist/server.cjs

@@ -8799,7 +8799,7 @@ var import_node_os2 = __toESM(require("node:os"), 1);
 var import_node_path33 = __toESM(require("node:path"), 1);
 
 // package.json
-var version = "1.52.0";
+var version = "1.53.0";
 
 // src/server/browser-focus.ts
 var import_node_child_process = require("node:child_process");
@@ -10534,14 +10534,10 @@ var boardAnchors = {
 var emptyBoardComments = () => ({ version: 1, threads: [] });
 var savedBoardComments = (incoming) => savedComments(incoming, boardAnchors);
 var mergeBoardComments = (base, incoming, origin, now, newId, name) => mergeComments(base, incoming, origin, now, newId, name, boardAnchors);
-function applyBoardHumanOp(file, op, now, newId, who) {
-  if (op.op !== "create") return applyThreadOp(file, op, now, newId, who);
-  const thread = openThread(op.anchor, "human", op.text, now, newId, who);
-  const closed = { status: "resolved", statusAt: now, statusBy: "human" };
-  if (isChoiceRecord(thread))
-    return { ...file, threads: [...file.threads, { ...thread, ...closed }] };
-  if (op.anchor.verdict !== "pass") return { ...file, threads: [...file.threads, thread] };
-  const rejected = (t7) => t7.anchor.group === op.anchor.group && t7.anchor.verdict === "reject" && t7.status === "open";
+function withVerdict(file, thread, now) {
+  if (thread.anchor.verdict !== "pass") return { ...file, threads: [...file.threads, thread] };
+  const closed = { status: "resolved", statusAt: now, statusBy: thread.statusBy };
+  const rejected = (t7) => t7.anchor.group === thread.anchor.group && t7.anchor.verdict === "reject" && t7.status === "open";
   return {
     ...file,
     threads: [
@@ -10550,6 +10546,34 @@ function applyBoardHumanOp(file, op, now, newId, who) {
     ]
   };
 }
+function withdrawVerdict(file, op, now) {
+  return {
+    ...file,
+    threads: file.threads.map(
+      (t7) => t7.id === op.threadId ? {
+        ...t7,
+        messages: t7.messages.map(
+          (m11) => m11.id === op.messageId && !m11.deleted ? { ...m11, text: "", deleted: true, editedAt: now } : m11
+        )
+      } : t7
+    )
+  };
+}
+function applyBoardHumanOp(file, op, now, newId, who) {
+  if (op.op === "delete" && file.threads.find((t7) => t7.id === op.threadId)?.anchor.verdict)
+    return withdrawVerdict(file, op, now);
+  if (op.op !== "create") return applyThreadOp(file, op, now, newId, who);
+  const thread = openThread(op.anchor, "human", op.text, now, newId, who);
+  if (isChoiceRecord(thread))
+    return {
+      ...file,
+      threads: [
+        ...file.threads,
+        { ...thread, status: "resolved", statusAt: now, statusBy: "human" }
+      ]
+    };
+  return withVerdict(file, thread, now);
+}
 function applyBoardAgentOp(file, op, now, newId, name) {
   if (op.op === "resolve" && file.threads.find((t7) => t7.id === op.threadId)?.anchor.verdict === "reject") {
     throw new Error("a reject closes only when your human partner passes the group");
@@ -10558,7 +10582,7 @@ function applyBoardAgentOp(file, op, now, newId, name) {
     const opened = openThread(op.anchor, "agent", op.text, now, newId, { name });
     const thread = isChoiceRecord(opened) ? { ...opened, status: "resolved", statusAt: now, statusBy: "agent" } : opened;
     return {
-      file: { ...file, threads: [...file.threads, thread] },
+      file: withVerdict(file, thread, now),
       threadId: thread.id,
       messageId: thread.messages[0].id
     };
@@ -10604,14 +10628,12 @@ function groupVerdict(threads, group, stale) {
   if (!latest2) return { state: "pending", evidenceUpdated: false, rejectThreads };
   const at7 = openedAt(latest2);
   if (stale.has(latest2.id)) return { state: "pending", at: at7, evidenceUpdated: true, rejectThreads };
+  const by = latest2.messages[0]?.author === "agent" ? { by: "agent" } : {};
   if (latest2.anchor.verdict === "pass")
-    return { state: "pass", at: at7, evidenceUpdated: false, rejectThreads };
-  return {
-    state: latest2.status === "open" ? "reject" : "pending",
-    at: at7,
-    evidenceUpdated: false,
-    rejectThreads
-  };
+    return { state: "pass", at: at7, ...by, evidenceUpdated: false, rejectThreads };
+  if (latest2.status !== "open")
+    return { state: "pending", at: at7, evidenceUpdated: false, rejectThreads };
+  return { state: "reject", at: at7, ...by, evidenceUpdated: false, rejectThreads };
 }
 
 // src/server/board-choices.ts
@@ -11045,7 +11067,10 @@ function boardSpecs(dir) {
           {
             file,
             page: typeof board.page === "string" ? board.page : "",
-            w: typeof board.w === "number" ? board.w : 0
+            x: typeof board.x === "number" ? board.x : 0,
+            y: typeof board.y === "number" ? board.y : 0,
+            w: typeof board.w === "number" ? board.w : 0,
+            h: typeof board.h === "number" ? board.h : 0
           }
         ]
       ] : [];
@@ -11252,6 +11277,36 @@ function createBoardCommentRegistry(options) {
       writeRounds(id2);
       return { threadId };
     },
+    agentVerdict: (id2, request, agent) => {
+      const groups = groupSpecs(dirOf(id2));
+      const specs = boardSpecs(dirOf(id2));
+      const threads = store(id2).current().threads;
+      const staleIds = new Set(stale(id2));
+      const targets = request.group === null ? Object.keys(groups).filter(
+        (group) => groups[group].verify && groupVerdict(threads, group, staleIds).state !== "pass"
+      ) : [request.group];
+      const anchors = targets.map((group) => {
+        if (!groups[group]?.verify) throw new Error(`no verify group ${group} in artboard/${id2}`);
+        const members = groups[group].boards.flatMap((board) => specs[board] ?? []);
+        if (!members.length) throw new Error(`verify group ${group} has no boards`);
+        return {
+          page: members[0].page,
+          x: Math.max(...members.map((b6) => b6.x + b6.w)),
+          y: Math.min(...members.map((b6) => b6.y)),
+          group,
+          verdict: request.verdict
+        };
+      });
+      const hashes2 = fresh(id2);
+      const threadIds = anchors.map(
+        (anchor) => store(id2).applyAgent(
+          { op: "add", anchor: stamp(anchor, hashes2, groups), text: request.text },
+          agent
+        ).threadId
+      );
+      if (threadIds.length) push2(id2);
+      return { groups: targets, threadIds };
+    },
     rounds: (id2) => roundViews(choiceContext(dirOf(id2)), store(id2).current().threads).map(
       ({ boards: _boards, ...round }) => round
     ),
@@ -24532,9 +24587,19 @@ function installInspector(win, properties, commentCursor = "crosshair", pointerC
       (target) => target instanceof win.Element && target.matches("input,textarea,select,[contenteditable]")
     ))
       return;
-    if (!["Space", "KeyH", "KeyV", "KeyC", "Escape", "Equal", "Minus", "Digit0", "Digit1"].includes(
-      event.code
-    ))
+    if (![
+      "Space",
+      "KeyH",
+      "KeyV",
+      "KeyC",
+      "KeyJ",
+      "KeyK",
+      "Escape",
+      "Equal",
+      "Minus",
+      "Digit0",
+      "Digit1"
+    ].includes(event.code))
       return;
     event.preventDefault();
     event.stopImmediatePropagation();
@@ -26180,6 +26245,9 @@ function commentNames({ agentFile, projectDir, cloud }) {
 function createDirectRelay(options) {
   const sockets = /* @__PURE__ */ new Map();
   let opened = 0;
+  const logLine = (event, detail) => console.info(
+    JSON.stringify({ type: "direct-relay", event, at: (/* @__PURE__ */ new Date()).toISOString(), ...detail })
+  );
   const write = (socket, message) => socket.write(textFrame(JSON.stringify(message)));
   const onText = async (socket, key2, conn, text3) => {
     let message;
@@ -26210,17 +26278,27 @@ function createDirectRelay(options) {
       completeHandshake(socket, clientKey);
       const conn = `direct:${++opened}`;
       sockets.set(socket, { key: key2, conn });
+      const openedAt2 = Date.now();
+      logLine("open", { conn, key: key2, viewers: sockets.size });
       write(socket, { t: "presence", online: true, version: options.version });
       handleClientFrames(socket, (text3) => void onText(socket, key2, conn, text3));
-      const forget = () => {
-        if (sockets.delete(socket)) options.onClose(conn);
+      const forget = (how, error) => {
+        if (!sockets.delete(socket)) return;
+        logLine("close", {
+          conn,
+          key: key2,
+          how,
+          aliveMs: Date.now() - openedAt2,
+          ...error ? { error: error.message } : {}
+        });
+        options.onClose(conn);
       };
       socket.on("end", () => {
-        forget();
+        forget("end");
         socket.end();
       });
-      socket.on("close", forget);
-      socket.on("error", forget);
+      socket.on("close", () => forget("close"));
+      socket.on("error", (error) => forget("error", error));
       options.onActivity();
     },
     emit(key2, body) {
@@ -101078,6 +101156,20 @@ async function serveAgentComments(req, res, ctx, id2) {
     sendJson(res, 400, { error: err.message });
   }
 }
+function agentVerdictOf(fields) {
+  const verdict = fields.verdict;
+  if (verdict !== "pass" && verdict !== "reject")
+    throw new Error('verdict needs {verdict: "pass" | "reject"}');
+  if (fields.all !== true && !isId(fields.group))
+    throw new Error("verdict needs {group} or {all: true}");
+  const text3 = typeof fields.text === "string" ? fields.text.trim() : "";
+  if (verdict === "reject" && !text3) throw new Error("a reject needs a reason: pass {text}");
+  return {
+    group: fields.all === true ? null : fields.group,
+    verdict,
+    text: text3 || "Pass"
+  };
+}
 async function serveAgentBoardComments(req, res, ctx, id2) {
   const { root, boardComments } = ctx;
   const dir = resolveArtifactDir(root, "artboard", id2);
@@ -101115,6 +101207,14 @@ async function serveAgentBoardComments(req, res, ctx, id2) {
     }
     return;
   }
+  if (fields.op === "verdict") {
+    try {
+      sendJson(res, 200, boardComments.agentVerdict(id2, agentVerdictOf(fields), agent));
+    } catch (err) {
+      sendJson(res, 400, { error: err.message });
+    }
+    return;
+  }
   const shorthand = agentAddOnBoard(body, boardSpecs(dir));
   if (shorthand && "error" in shorthand) {
     sendJson(res, 400, { error: `${shorthand.error} in artboard/${id2}` });
@@ -102932,7 +103032,7 @@ async function main() {
   async function shutdown(reason, intended = true) {
     if (stopping) return;
     stopping = true;
-    console.info(JSON.stringify({ type: "server-stopped", reason }));
+    console.info(JSON.stringify({ type: "server-stopped", reason, at: (/* @__PURE__ */ new Date()).toISOString() }));
     import_node_fs38.default.rmSync(paths.info, { force: true });
     if (intended) writeJsonAtomic(paths.stopped, { reason, timestamp: Date.now() });
     await hub.close();
@@ -102996,7 +103096,7 @@ async function main() {
     cloudOrigin: config.cloudOrigin
   };
   writeJsonAtomic(paths.info, started);
-  console.info(JSON.stringify(started));
+  console.info(JSON.stringify({ ...started, at: (/* @__PURE__ */ new Date()).toISOString() }));
 }
 main().catch((err) => {
   console.info(JSON.stringify({ type: "server-error", error: err.message }));