@popoverai/dotrequirements 0.36.1 → 0.37.1

package/dist/commands/solution/brief.d.ts

@@ -54,8 +54,6 @@ export type PanelOutcome = {
         agent: string;
         part: "draft" | "review";
     }>;
-    /** The reviewers waiting on its pull request, their sessions ended (PULL-5). */
-    waiting?: string[];
 };
 /** A checkpoint on the plan panel, as far as the CLI reads it. */
 export type PanelCheckpoint = {

package/dist/commands/solution/index.js

@@ -7,7 +7,7 @@ import { REQUEST_CONTRACT } from "./contract.js";
 import { createCommand } from "./create.js";
 import { thingsCommand } from "./look-up.js";
 import { nextCommand } from "./next.js";
-import { prStatusCommand, prWaitCommand, pullRequestCommand, } from "./pull-request.js";
+import { prStatusCommand, pullRequestCommand } from "./pull-request.js";
 import { rehearseCommand } from "./rehearse.js";
 import { reviewCommand } from "./review.js";
 import { doneCommand } from "./share.js";
@@ -97,22 +97,11 @@ const PR_STATUS_HELP = `
 Reads the pull request of the outcome you are at, or of the outcome it awaits that
 is kept on one, as GitHub reports it. The merge state is GitHub's word for whether
 it can merge: clean means it can, with every required check passing and no
-conflict. Failed checks come with a link to them; checks still running are named.
-Reading it changes nothing.
-`;
-/** What `pr wait` does, on its `--help` (PULL-5, PULL-6). */
-const PR_WAIT_HELP = `
-For a reviewer, while the pull request's checks run or GitHub works out whether it
-can merge. Records where it stands now; then end your session without a result.
-You are started again, in this session, once GitHub reports it clean, once it is
-merged or closed, or when the wait is up: ten minutes unless you say, up to an
-hour. A conflict, a failed check or a branch behind doesn't change by waiting:
-judge it now. A new submission ends the wait too, and you review that as you
-would any other.
-
-Examples:
-  dotreq solution pr wait
-  dotreq solution pr wait 30m
+conflict. Failed checks come with a link to them and what they reported, as GitHub
+gives it: their output and annotations, or the end of their job's log. Checks still
+running are named. Each review follows, with its verdict and its comments, from the
+repository's owners, members and collaborators and the apps installed on it; those
+by anyone else are left out and counted. Reading it changes nothing.
 `;
 /** What `pr open` does, on its `--help`, where `author --help` sends the agent (PULL-2). */
 const PULL_REQUEST_HELP = `
@@ -249,7 +238,7 @@ export function registerSolution(program) {
         .action(wrap(authorCommand));
     const pr = solution
         .command("pr", HIDDEN)
-        .description("The solution's pull request: open it, read it, wait on it");
+        .description("The solution's pull request: open it, read it");
     whereOptions(pr
         .command("open")
         .description("Push the solution's branch and open its pull request, or find the one open; prints its reference, pr:<number>, to submit"))
@@ -261,11 +250,6 @@ export function registerSolution(program) {
         .option("--json", "Print as JSON")
         .addHelpText("after", PR_STATUS_HELP)
         .action(wrap(prStatusCommand));
-    whereOptions(pr
-        .command("wait [duration]")
-        .description("Wait on the pull request with your session ended, for ten minutes unless you say (as 5m or 1h, up to an hour): you start again once it is clean, merged or closed, or when the time is up"))
-        .addHelpText("after", PR_WAIT_HELP)
-        .action(wrap(prWaitCommand));
     whereOptions(solution
         .command("review <result> [video...]", HIDDEN)
         .description("Record the review's result: approved, approved-with-revisions or needs-revision"))

package/dist/commands/solution/pull-request.d.ts

@@ -18,15 +18,16 @@ export type PullRequestState = {
         name: string;
         result: string;
         link: string | null;
+        /** What the check reported, as GitHub gave it, or why it couldn't (PULL-4.7). */
+        reported?: unknown;
     }>;
     running: Array<{
         name: string;
         link: string | null;
     }>;
     head: string;
+    reviews?: unknown;
 };
-/** Where the pull request stood, in words, as a wait records it beside what the line shows (PULL-5.1.0). */
-export declare function seenOf(state: PullRequestState): string;
 /** Where the pull request stands, as a reviewer reads it (PULL-4). */
 export declare function describeState(state: PullRequestState): string;
 /**
@@ -36,17 +37,6 @@ export declare function describeState(state: PullRequestState): string;
 export declare function prStatusCommand(options: WhereOptions & {
     json?: boolean;
 }): Promise<void>;
-/** A wait's length as an agent types it, `90s`, `5m` or `1h`, in milliseconds; refused past an hour or at none (PULL-5.8 to 5.10). */
-export declare function waitFor(duration: string | undefined): number;
-/**
- * `dotreq solution pr wait [duration]`: the reviewer waits on the pull
- * request with no session running (PULL-5), ten minutes unless it says, up
- * to an hour: it records what it saw, and its session can end without a
- * result. It starts again, in the same session, once the pull request is
- * `clean`, once it is merged or closed, or when the wait is up (PULL-6). A
- * pull request already `clean` needs no wait (5.11).
- */
-export declare function prWaitCommand(duration: string | undefined, options: WhereOptions): Promise<void>;
 /**
  * `dotreq solution pr open`: the solution's pull request, opened or
  * found (PULL-2). Inside a runner the branch is pushed first, as a submission

package/dist/commands/solution/pull-request.js

@@ -1,5 +1,4 @@
 import { webApiUrl } from "../../cloud.js";
-import { api } from "../../convex.js";
 import { getProjectCredentials } from "../../utils/project-settings.js";
 import { solutionClient } from "./client.js";
 import { pushWork } from "./pushing.js";
@@ -7,16 +6,6 @@ import { requireWhere } from "./run-file.js";
 import { outcomeFor } from "./status.js";
 /** The command that opens the solution's pull request and prints its reference. */
 export const OPEN_IT = "dotreq solution pr open";
-/** Where the pull request stood, in words, as a wait records it beside what the line shows (PULL-5.1.0). */
-export function seenOf(state) {
-    return [
-        state.head,
-        state.mergeState,
-        state.mergeable,
-        state.reviewDecision ?? "",
-        state.checks ?? "",
-    ].join(" ");
-}
 /** The pull request the outcome the agent is at reads, as the app finds it (PULL-4.0, 4.0.0). */
 async function stateFor(where) {
     const said = await ask({
@@ -38,7 +27,14 @@ async function stateFor(where) {
     }
     if (!said.state)
         throw new Error("The app gave no pull request.");
-    return said.state;
+    return said.reviews === undefined
+        ? said.state
+        : { ...said.state, reviews: said.reviews };
+}
+/** What GitHub reported, as it gave it, indented under the line it belongs to. */
+function asGiven(reported, indent) {
+    const text = typeof reported === "string" ? reported : JSON.stringify(reported, null, 2);
+    return text.split("\n").map((line) => `${indent}${line}`);
 }
 /** Where the pull request stands, as a reviewer reads it (PULL-4). */
 export function describeState(state) {
@@ -51,13 +47,21 @@ export function describeState(state) {
     ];
     for (const check of state.failed) {
         lines.push(`  failed: ${check.name} (${check.result})${check.link ? ` ${check.link}` : ""}`);
+        // PULL-4.7: what it reported, as GitHub gave it.
+        if (check.reported !== undefined) {
+            lines.push("    It reported:", ...asGiven(check.reported, "      "));
+        }
     }
     for (const check of state.running) {
         lines.push(`  still running: ${check.name}${check.link ? ` ${check.link}` : ""}`);
     }
     if (state.mergeable === "unknown") {
         // PULL-4.3.
-        lines.push("GitHub hasn't yet worked out whether it can merge: read it again shortly, or wait on it.");
+        lines.push("GitHub hasn't yet worked out whether it can merge: read it again shortly.");
+    }
+    // PULL-4.8: each review, with its verdict and its comments.
+    if (state.reviews !== undefined) {
+        lines.push("Reviews and their comments, as GitHub gave them:", ...asGiven(state.reviews, "  "));
     }
     return lines.join("\n");
 }
@@ -69,65 +73,6 @@ export async function prStatusCommand(options) {
     const state = await stateFor(requireWhere(options));
     console.log(options.json ? JSON.stringify(state) : describeState(state));
 }
-/** What a reviewer is told when it asks for a wait it can't have (PULL-5.10), in the backend's words. */
-const WAIT_REFUSED = "Nothing is waiting: a wait is up to an hour, ten minutes unless you say, as `dotreq solution pr wait 5m` or `pr wait 1h`.";
-/** A wait's length as an agent types it, `90s`, `5m` or `1h`, in milliseconds; refused past an hour or at none (PULL-5.8 to 5.10). */
-export function waitFor(duration) {
-    if (duration === undefined)
-        return 10 * 60 * 1000;
-    const found = /^(\d+)(s|m|h)$/.exec(duration.trim());
-    const unit = { s: 1000, m: 60 * 1000, h: 60 * 60 * 1000 };
-    const ms = found ? Number(found[1]) * unit[found[2]] : 0;
-    if (!(ms > 0 && ms <= 60 * 60 * 1000))
-        throw new Error(WAIT_REFUSED);
-    return ms;
-}
-/** In words, how long a wait is. */
-function forHowLong(ms) {
-    if (ms === 3_600_000)
-        return "an hour";
-    if (ms % 60_000 !== 0) {
-        const seconds = Math.round(ms / 1000);
-        return `${seconds} second${seconds === 1 ? "" : "s"}`;
-    }
-    const minutes = ms / 60_000;
-    return `${minutes} minute${minutes === 1 ? "" : "s"}`;
-}
-/**
- * `dotreq solution pr wait [duration]`: the reviewer waits on the pull
- * request with no session running (PULL-5), ten minutes unless it says, up
- * to an hour: it records what it saw, and its session can end without a
- * result. It starts again, in the same session, once the pull request is
- * `clean`, once it is merged or closed, or when the wait is up (PULL-6). A
- * pull request already `clean` needs no wait (5.11).
- */
-export async function prWaitCommand(duration, options) {
-    const forMs = waitFor(duration);
-    const where = requireWhere(options);
-    const state = await stateFor(where);
-    if (state.mergeState === "clean") {
-        throw new Error(`Nothing is waiting: the pull request is already \`clean\`.\n\n${describeState(state)}`);
-    }
-    await solutionClient().mutation(api.solutions.waits.waitOnPullRequest, {
-        solutionId: where.solutionId,
-        agent: where.agent,
-        ...(where.outcome ? { outcome: where.outcome } : {}),
-        seen: seenOf(state),
-        saw: {
-            number: state.number,
-            url: state.url,
-            conflicting: state.mergeable === "conflicting",
-            failed: state.failed.length,
-            running: state.running.length,
-        },
-        forMs,
-    });
-    console.log([
-        describeState(state),
-        "",
-        `Waiting on it. End your session now: you'll be started again, here, once it is \`clean\`, once it is merged or closed, or in ${forHowLong(forMs)}, whichever comes first.`,
-    ].join("\n"));
-}
 /**
  * `dotreq solution pr open`: the solution's pull request, opened or
  * found (PULL-2). Inside a runner the branch is pushed first, as a submission

package/dist/commands/solution/status.js

@@ -140,14 +140,10 @@ export async function statusCommand(options) {
     // other reviewer stalled. Asking, stalling and recording all take the
     // agent off it.
     const atIt = outcome.atWork?.some((each) => each.agent === where.agent && each.part === part) === true;
-    // PULL-5.2: a reviewer waiting on the pull request owes nothing until it
-    // starts again.
-    const waiting = part === "review" && outcome.waiting?.includes(where.agent) === true;
     const owes = part === "draft"
         ? !setAside &&
             (atIt || outcome.status === "drafting" || outcome.status === "ready")
-        : !waiting &&
-            (atIt || outcome.status === "reviewing") &&
+        : (atIt || outcome.status === "reviewing") &&
             (await reviewerOwes(client, where.solutionId, outcome.name, where.agent));
     if (options.json) {
         process.stdout.write(`${JSON.stringify({ agent: where.agent, outcome: outcome.name, part, status: outcome.status, reason: outcome.reason ?? null, reviews: part === "review", ...(setAside ? { setAside } : {}), owes })}\n`);

package/dist/convex.d.ts

@@ -122,9 +122,6 @@ export declare const api: {
             recordPush: import("convex/server").FunctionReference<"mutation", "public", any, any, string | undefined>;
             removal: import("convex/server").FunctionReference<"query", "public", any, any, string | undefined>;
         };
-        waits: {
-            waitOnPullRequest: import("convex/server").FunctionReference<"mutation", "public", any, any, string | undefined>;
-        };
     };
     lib: {
         authActions: {

package/dist/convex.js

@@ -143,9 +143,6 @@ export const api = {
             recordPush: mutation("solutions/branches:recordPush"),
             removal: query("solutions/branches:removal"),
         },
-        waits: {
-            waitOnPullRequest: mutation("solutions/waits:waitOnPullRequest"),
-        },
     },
     lib: {
         authActions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popoverai/dotrequirements",
-  "version": "0.36.1",
+  "version": "0.37.1",
   "description": "Requirements as testable, human-readable data — CLI and test harness for spec-driven development with AI coding agents",
   "type": "module",
   "bin": {