@popoverai/dotrequirements 0.37.1 → 0.38.0

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, pullRequestCommand } from "./pull-request.js";
+import { pullRequestCommand } from "./pull-request.js";
 import { rehearseCommand } from "./rehearse.js";
 import { reviewCommand } from "./review.js";
 import { doneCommand } from "./share.js";
@@ -92,17 +92,6 @@ Examples:
   dotreq solution author file:src/checkout.ts@guest pr:12 image:checkout.png --comment "Guest path, behind the flag."
   dotreq solution author "preview:8080/design/roll-count pnpm dev" file:src/RollCount.tsx --title "Roll count after three dice" --title "Roll count component" --comment "The roll count, as a dev-only page."
 `;
-/** What `pr status` says, on its `--help` (PULL-4). */
-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 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 = `
 Pushes your commits to the solution's branch, then opens a pull request from it
@@ -238,18 +227,12 @@ export function registerSolution(program) {
         .action(wrap(authorCommand));
     const pr = solution
         .command("pr", HIDDEN)
-        .description("The solution's pull request: open it, read it");
+        .description("The solution's pull request: open it. Read it on GitHub, with your GitHub tools");
     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"))
         .addHelpText("after", PULL_REQUEST_HELP)
         .action(wrap(pullRequestCommand));
-    whereOptions(pr
-        .command("status")
-        .description("Where the pull request of the outcome you are at stands, in GitHub's words: its merge state, conflicts, review decision and checks"))
-        .option("--json", "Print as JSON")
-        .addHelpText("after", PR_STATUS_HELP)
-        .action(wrap(prStatusCommand));
     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

@@ -6,37 +6,6 @@ export type PullRequest = {
 };
 /** The command that opens the solution's pull request and prints its reference. */
 export declare const OPEN_IT = "dotreq solution pr open";
-/** Where a pull request stands, in GitHub's words (web: lib/runner/github.ts). */
-export type PullRequestState = {
-    number: number;
-    url: string;
-    mergeState: string;
-    mergeable: string;
-    reviewDecision: string | null;
-    checks: string | null;
-    failed: Array<{
-        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 stands, as a reviewer reads it (PULL-4). */
-export declare function describeState(state: PullRequestState): string;
-/**
- * `dotreq solution pr status`: where the pull request of the outcome the
- * agent is at stands, in GitHub's words (PULL-4). Changes nothing (4.6).
- */
-export declare function prStatusCommand(options: WhereOptions & {
-    json?: boolean;
-}): 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

@@ -6,73 +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";
-/** 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({
-        solutionId: where.solutionId,
-        agent: where.agent,
-        ...(where.outcome ? { outcome: where.outcome } : {}),
-        op: "status",
-    });
-    if (said.noRepository) {
-        // PULL-4.5.
-        throw new Error("There's no pull request: a pull request needs a repository, and this project has none connected.");
-    }
-    if (said.noBranch || said.none) {
-        // PULL-4.4.
-        throw new Error(`There's no pull request open for it. Its drafter opens one with \`${OPEN_IT}\`.`);
-    }
-    if (said.refused) {
-        throw new Error(`Couldn't read the pull request from the repository: ${said.refused}`);
-    }
-    if (!said.state)
-        throw new Error("The app gave no pull request.");
-    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) {
-    const lines = [
-        `pr:${state.number} (${state.url}), at ${state.head.slice(0, 7)}`,
-        `Merge state: ${state.mergeState}`,
-        `Conflicts with the branch it merges into: ${state.mergeable === "conflicting" ? "yes" : state.mergeable === "mergeable" ? "no" : "not worked out yet"}`,
-        `Review decision: ${state.reviewDecision ?? "none required"}`,
-        `Checks: ${state.checks ?? "none"}`,
-    ];
-    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.");
-    }
-    // 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");
-}
-/**
- * `dotreq solution pr status`: where the pull request of the outcome the
- * agent is at stands, in GitHub's words (PULL-4). Changes nothing (4.6).
- */
-export async function prStatusCommand(options) {
-    const state = await stateFor(requireWhere(options));
-    console.log(options.json ? JSON.stringify(state) : describeState(state));
-}
 /**
  * `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
@@ -165,8 +98,8 @@ function pullRequestIn(said) {
 /**
  * Ask the app's pull-request route, on the project's credentials: with the
  * outcome, to open the pull request it is kept on; with a number, to check
- * that one is the solution's open pull request, which needs no outcome;
- * with `op: "status"`, for where the open one stands.
+ * that one is the solution's open pull request, which needs no outcome.
+ * Agents read where it stands on GitHub itself (PULL-4).
  */
 async function ask(body) {
     const { projectId, projectSecret } = getProjectCredentials();

package/dist/rehearsal/derive.d.ts

@@ -7,7 +7,9 @@ import type { Plan, PlanPart } from "./types.js";
  * So a scenario naming Scores alone, of the default plan, runs the scores
  * with the pitch an input. An outcome on one left out is kept on that
  * one's surface instead. The checkpoints on what is kept stay, presenting
- * what is still there; loops go, since part of a plan starts or ends
+ * what is still there, and one named into a phase the part doesn't have
+ * names none; a pull-request surface's ready for review or draft on an
+ * outcome left out goes; and loops go, since part of a plan starts or ends
  * nothing.
  *
  * The one exception is the outcome that makes the solution exist: the

package/dist/rehearsal/derive.js

@@ -35,7 +35,9 @@ const worksFrom = (plan, outcome) => [
  * So a scenario naming Scores alone, of the default plan, runs the scores
  * with the pitch an input. An outcome on one left out is kept on that
  * one's surface instead. The checkpoints on what is kept stay, presenting
- * what is still there; loops go, since part of a plan starts or ends
+ * what is still there, and one named into a phase the part doesn't have
+ * names none; a pull-request surface's ready for review or draft on an
+ * outcome left out goes; and loops go, since part of a plan starts or ends
  * nothing.
  *
  * The one exception is the outcome that makes the solution exist: the
@@ -85,18 +87,38 @@ export function planForOutcomes(plan, names) {
     const known = new Set([...kept, ...inputs]);
     const keptOn = (on) => kept.has(on) ||
         [...kept].some((name) => surfaceOf(plan, name) === on && name !== on);
+    // A checkpoint named into a phase the part no longer has sits after what
+    // it presents, as it would naming none.
+    const placed = (checkpoint) => {
+        if (checkpoint.phase === undefined ||
+            phases.some((phase) => phase.name === checkpoint.phase)) {
+            return checkpoint;
+        }
+        const { phase: _phase, ...rest } = checkpoint;
+        return rest;
+    };
     const checkpoints = plan.checkpoints.flatMap((checkpoint) => {
         if (!keptOn(checkpoint.on))
             return [];
         if (!checkpoint.presents?.length)
-            return [checkpoint];
+            return [placed(checkpoint)];
         const presents = checkpoint.presents.filter((name) => known.has(name));
-        return presents.length > 0 ? [{ ...checkpoint, presents }] : [];
+        return presents.length > 0 ? [placed({ ...checkpoint, presents })] : [];
     });
     return {
         format: "outcomes",
         inputs,
-        surfaces: plan.surfaces,
+        // A pull request's moment on an outcome left out never comes (PULL-7.3).
+        surfaces: plan.surfaces.map((surface) => {
+            const own = { ...surface };
+            if (surface.readyForReview && !kept.has(surface.readyForReview.outcome)) {
+                delete own.readyForReview;
+            }
+            if (surface.draft && !kept.has(surface.draft.outcome)) {
+                delete own.draft;
+            }
+            return own;
+        }),
         phases,
         checkpoints,
         agents: plan.agents,

package/dist/rehearsal/types.d.ts

@@ -93,6 +93,16 @@ export type Plan = {
     surfaces: Array<{
         name: string;
         kind: string;
+        /** When a pull-request surface's pull request asks for review, or goes back to draft (PULL-7). */
+        readyForReview?: {
+            outcome: string;
+            when: string;
+        };
+        draft?: {
+            outcome: string;
+            when: string;
+        };
+        watchedBy?: string;
     }>;
     phases: Array<{
         name: string;
@@ -103,6 +113,7 @@ export type Plan = {
         name: string;
         on: string;
         presents?: string[];
+        phase?: string;
     }>;
     agents: Array<{
         name: string;

package/package.json

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