@a9n-shoji/rvw 0.2.4 → 0.3.0

package/skills/rvw-watch-comments/scripts/watch-driver.mjs

@@ -23,6 +23,7 @@ const EXIT_AUTO_ACK = 23;
 const EXIT_ALREADY_RUNNING = 24;
 const DEFAULT_MAX_IN_FLIGHT = 1;
 const DEFAULT_AUTO_ACK_POLL_MS = 250;
+const MAX_AUTHOR_LABEL_CHARACTERS = 100;
 const scriptDirectory = path.dirname(fileURLToPath(import.meta.url));
 const stateScript = path.join(scriptDirectory, "watch-state.mjs");
 const autoAckScript = path.join(scriptDirectory, "auto-ack.mjs");
@@ -41,6 +42,7 @@ function parseArguments(values) {
   let autoAck = false;
   let maxInFlight = DEFAULT_MAX_IN_FLIGHT;
   let maxInFlightProvided = false;
+  let authorLabel = null;
   for (let index = 0; index < values.length; index += 1) {
     const value = values[index];
     if (value === "--auto-ack") {
@@ -60,6 +62,18 @@ function parseArguments(values) {
       index += 1;
       continue;
     }
+    if (value === "--author-label") {
+      const next = values[index + 1];
+      if (!next || next.startsWith("--") || next.length > MAX_AUTHOR_LABEL_CHARACTERS) {
+        throw new DriverError(
+          `--author-label must contain 1 through ${MAX_AUTHOR_LABEL_CHARACTERS} characters`,
+          EXIT_WATCH,
+        );
+      }
+      authorLabel = next;
+      index += 1;
+      continue;
+    }
     if (value === "--state") {
       const next = values[index + 1];
       if (!next || next.startsWith("--")) {
@@ -79,7 +93,10 @@ function parseArguments(values) {
   if (!autoAck && maxInFlightProvided) {
     throw new DriverError("--max-in-flight requires --auto-ack", EXIT_WATCH);
   }
-  return { state: path.resolve(state), autoAck, maxInFlight };
+  if (!autoAck && authorLabel !== null) {
+    throw new DriverError("--author-label requires --auto-ack", EXIT_WATCH);
+  }
+  return { state: path.resolve(state), autoAck, maxInFlight, authorLabel };
 }
 
 async function runNodeScript(script, args, input) {
@@ -219,20 +236,17 @@ function releaseDriverLock(lock) {
   unlinkIfOwned(lock.path, lock.identity);
 }
 
-async function dispatchAutoAck(state, pullRequest) {
-  const result = await runNodeScript(autoAckScript, [
-    "--state",
-    state,
-    "--pull-request",
-    pullRequest,
-  ]);
+async function dispatchAutoAck(state, pullRequest, authorLabel) {
+  const args = ["--state", state, "--pull-request", pullRequest];
+  if (authorLabel !== null) args.push("--author-label", authorLabel);
+  const result = await runNodeScript(autoAckScript, args);
   if (result.code !== 0 || !result.json?.ok) {
     throw new DriverError(`auto-ack failed for ${pullRequest}`, EXIT_AUTO_ACK, result);
   }
   write({ ...result.json, type: "batch-acknowledged" });
 }
 
-async function dispatchPendingAutoAcks(state, maxInFlight) {
+async function dispatchPendingAutoAcks(state, maxInFlight, authorLabel) {
   const work = await stateCommand(state, "list");
   const inFlight = Number(work.inFlight);
   if (!Number.isSafeInteger(inFlight) || inFlight < 0 || !Array.isArray(work.pending)) {
@@ -241,12 +255,26 @@ async function dispatchPendingAutoAcks(state, maxInFlight) {
   let available = Math.max(0, maxInFlight - inFlight);
   for (const batch of work.pending) {
     if (available === 0) break;
-    await dispatchAutoAck(state, batch.pullRequest);
+    await dispatchAutoAck(state, batch.pullRequest, authorLabel);
     available -= 1;
   }
 }
 
-async function processFrame(state, frame, autoAck, maxInFlight) {
+async function assertTaskAuthorLabel(state, authorLabel) {
+  const current = await stateCommand(state, "status");
+  if (!current.authorLabelBound || current.authorLabel === authorLabel) return;
+  throw new DriverError(
+    `Existing task author label ${current.authorLabel ?? "(unlabeled)"} does not match ${authorLabel ?? "(unlabeled)"}`,
+    EXIT_AUTO_ACK,
+    {
+      state,
+      expectedAuthorLabel: current.authorLabel,
+      receivedAuthorLabel: authorLabel,
+    },
+  );
+}
+
+async function processFrame(state, frame, autoAck, maxInFlight, authorLabel) {
   if (!frame || typeof frame !== "object" || typeof frame.type !== "string") {
     throw new DriverError("Invalid RFC 7464 frame", EXIT_SEQUENCE, frame);
   }
@@ -263,6 +291,7 @@ async function processFrame(state, frame, autoAck, maxInFlight) {
       anchoredAtCurrent: frame.anchoredAtCurrent,
       autoAck,
       maxInFlight: autoAck ? maxInFlight : null,
+      authorLabel: autoAck ? authorLabel : null,
     });
   } else if (frame.type === "comment-posted" && ingested.status === "queued") {
     if (!autoAck) {
@@ -286,7 +315,7 @@ function autoAckPollMilliseconds() {
     : DEFAULT_AUTO_ACK_POLL_MS;
 }
 
-async function runWatchOnce(state, autoAck, maxInFlight, stopping) {
+async function runWatchOnce(state, autoAck, maxInFlight, authorLabel, stopping) {
   const current = await stateCommand(state, "status");
   const args = ["comment", "watch"];
   if (current.cursor) args.push("--after", current.cursor);
@@ -309,7 +338,7 @@ async function runWatchOnce(state, autoAck, maxInFlight, stopping) {
   const pumpAutoAcks = async () => {
     if (!autoAck || stopping.requested) return;
     if (autoAckPump) return autoAckPump;
-    autoAckPump = dispatchPendingAutoAcks(state, maxInFlight);
+    autoAckPump = dispatchPendingAutoAcks(state, maxInFlight, authorLabel);
     try {
       await autoAckPump;
     } catch (error) {
@@ -345,7 +374,7 @@ async function runWatchOnce(state, autoAck, maxInFlight, stopping) {
         }
         readySeen ||= frame.type === "ready";
         stoppedSeen ||= frame.type === "stopped";
-        await processFrame(state, frame, autoAck, maxInFlight);
+        await processFrame(state, frame, autoAck, maxInFlight, authorLabel);
       }
       await pumpAutoAcks();
     }
@@ -383,9 +412,10 @@ function delay(milliseconds) {
 }
 
 async function main() {
-  const { state, autoAck, maxInFlight } = parseArguments(process.argv.slice(2));
+  const { state, autoAck, maxInFlight, authorLabel } = parseArguments(process.argv.slice(2));
   const driverLock = acquireDriverLock(state);
   try {
+    if (autoAck) await assertTaskAuthorLabel(state, authorLabel);
     const stopping = { requested: false, child: null };
     const stop = () => {
       stopping.requested = true;
@@ -398,8 +428,8 @@ async function main() {
     try {
       while (!stopping.requested) {
         const startedAt = Date.now();
-        if (autoAck) await dispatchPendingAutoAcks(state, maxInFlight);
-        const result = await runWatchOnce(state, autoAck, maxInFlight, stopping);
+        if (autoAck) await dispatchPendingAutoAcks(state, maxInFlight, authorLabel);
+        const result = await runWatchOnce(state, autoAck, maxInFlight, authorLabel, stopping);
         if (stopping.requested) return;
         if (Date.now() - startedAt >= 30_000) restarts = 0;
         restarts += 1;

package/skills/rvw-watch-comments/scripts/watch-state.mjs

@@ -11,7 +11,7 @@ function fail(message) {
 
 function parseOptions(values) {
   const result = {};
-  const flags = new Set(["follow"]);
+  const flags = new Set(["follow", "no-author-label"]);
   for (let index = 0; index < values.length; index += 1) {
     const key = values[index];
     if (!key?.startsWith("--")) fail(`Unexpected argument: ${key ?? ""}`);
@@ -152,6 +152,32 @@ function setMeta(database, key, value) {
     .run(key, value);
 }
 
+function taskAuthorLabel(database) {
+  const stored = getMeta(database, "author_label");
+  return stored === null || stored === "" ? null : stored;
+}
+
+function bindTaskAuthorLabel(database, authorLabel) {
+  if (
+    authorLabel !== null &&
+    (typeof authorLabel !== "string" || authorLabel.length === 0 || authorLabel.length > 100)
+  ) {
+    fail("authorLabel must contain 1 through 100 characters or be null");
+  }
+  const encoded = authorLabel ?? "";
+  const stored = getMeta(database, "author_label");
+  if (stored === null) {
+    setMeta(database, "author_label", encoded);
+    return authorLabel;
+  }
+  if (stored !== encoded) {
+    fail(
+      `Existing task author label ${stored || "(unlabeled)"} does not match ${encoded || "(unlabeled)"}`,
+    );
+  }
+  return taskAuthorLabel(database);
+}
+
 function tableExists(database, tableName) {
   return Boolean(
     database
@@ -523,9 +549,13 @@ function createBatch(database, pullRequestUrl, now) {
   return batchId;
 }
 
-function claim(database, pullRequestUrl, writeKey) {
+function claim(database, pullRequestUrl, writeKey, requestedAuthorLabel) {
   const canonicalWriteKey = writeKey === undefined ? undefined : normalizeWriteKey(writeKey);
   return transaction(database, () => {
+    const authorLabel =
+      requestedAuthorLabel === undefined
+        ? taskAuthorLabel(database)
+        : bindTaskAuthorLabel(database, requestedAuthorLabel);
     const now = new Date().toISOString();
     const ownMode = getMeta(database, "own_mode");
     if (canonicalWriteKey !== undefined && ownMode !== "fix-and-push") {
@@ -591,6 +621,7 @@ function claim(database, pullRequestUrl, writeKey) {
       pullRequest: pullRequestUrl,
       attempts: Number(batch.attempts) + 1,
       writeKey: canonicalWriteKey ?? null,
+      authorLabel,
       events,
       operations,
     };
@@ -802,6 +833,8 @@ function status(database) {
     taskId: getMeta(database, "task_id"),
     databaseId: getMeta(database, "database_id"),
     cursor: getMeta(database, "cursor"),
+    authorLabel: taskAuthorLabel(database),
+    authorLabelBound: getMeta(database, "author_label") !== null,
     expectedGitHubLogin: getMeta(database, "expected_login") || null,
     ownPullRequests: getMeta(database, "own_mode"),
     otherPullRequests: "investigate-and-reply",
@@ -852,9 +885,23 @@ async function main() {
       return;
     }
     if (command === "claim") {
+      if (options["author-label"] !== undefined && options["no-author-label"] === true) {
+        fail("Pass either --author-label or --no-author-label, not both");
+      }
+      const requestedAuthorLabel =
+        options["author-label"] !== undefined
+          ? options["author-label"]
+          : options["no-author-label"] === true
+            ? null
+            : undefined;
       write({
         ok: true,
-        ...claim(database, required(options, "pull-request"), options["write-key"]),
+        ...claim(
+          database,
+          required(options, "pull-request"),
+          options["write-key"],
+          requestedAuthorLabel,
+        ),
       });
       return;
     }