@popoverai/dotrequirements 0.39.0 → 0.39.2

package/dist/commands/solution/author.js

@@ -4,6 +4,7 @@ import { api } from "../../convex.js";
 import { currentBranch, headCommit, repositoryRoot } from "./branch.js";
 import { solutionClient } from "./client.js";
 import { readImage, uploadImage } from "./image.js";
+import { ownChangesOf } from "./own-changes.js";
 import { screenshotPreview } from "./preview-screenshot.js";
 import { checkPullRequest } from "./pull-request.js";
 import { pushBeforeRecord, refuseUncommitted } from "./pushing.js";
@@ -76,6 +77,12 @@ export async function authorCommand(references, options) {
     // SOLDOC-12.2.0: a file from the checkout's own branch keeps the commit
     // it was submitted at, so the page can tell when it changes after.
     const commit = checkout ? headCommit(cwd) : null;
+    // CHECKPOINT-12.4 to 12.6: what the pull request would merge, taken after
+    // the push, so the checkpoint can tell a branch brought up to date from
+    // changed code. Without one, as when the fetch fails, the work is
+    // recorded all the same and reads as changed.
+    const merging = [...pullRequests.values()].find((made) => made.base);
+    const ownChanges = checkout && merging?.base ? ownChangesOf(cwd, merging.base) : null;
     /** A reference as it is submitted: where the thing is, as the backend keeps it. */
     const submissionOf = async (thing) => {
         const recording = videos.get(thing);
@@ -99,8 +106,12 @@ export async function authorCommand(references, options) {
             return { kind: "image", storageId, name: image.name };
         }
         const pullRequest = pullRequests.get(thing);
-        if (pullRequest)
-            return { kind: "pull request", ...pullRequest };
+        if (pullRequest) {
+            // The branch it merges into is the CLI's, for `ownChanges`; the
+            // backend keeps the pull request by its number and address.
+            const { base: _base, ...kept } = pullRequest;
+            return { kind: "pull request", ...kept };
+        }
         if (thing.kind === "preview") {
             // SIGHT-12.0, 12.2: a screenshot of the page it opens on, kept as an
             // image is; without one, it is submitted all the same.
@@ -141,6 +152,7 @@ export async function authorCommand(references, options) {
         comment,
         ...(summary ? { summary } : {}),
         ...(files.length ? { files } : {}),
+        ...(ownChanges ? { ownChanges } : {}),
     };
     const result = await client.mutation(api.solutions.mutations.complete, args);
     const saved = result?.saved ?? [];

package/dist/commands/solution/checkout.js

@@ -48,6 +48,7 @@ export async function pushCommand(options) {
         ? await pushWork(solutionClient(), {
             solutionId: where.solutionId,
             branch: where.branch,
+            ...(where.agent ? { agent: where.agent } : {}),
         })
         : { ok: true, pushed: false };
     const result = outcome.ok

package/dist/commands/solution/index.js

@@ -220,7 +220,7 @@ export function registerSolution(program) {
     whereOptions(solution
         .command("author <reference...>", HIDDEN)
         .description("Record what you made, and what changed and why"))
-        .option("--comment <text>", "What changed and why: the next reader sees it first (required)")
+        .option("--comment <text>", "What changed and why: the next reader sees it first, so open on a sentence that stands on its own and says what changed (required)")
         .option("--executive-summary <text>", "For the owner, when your work moves on before anyone reviews it (required there)")
         .option("--summary <text>", "Short for --executive-summary")
         .option("--title <text>", "A reference's name on the outcome's tab, for the owner: one per reference, in the order the references are given, or none", (value, previous = []) => [...previous, value])

package/dist/commands/solution/own-changes.d.ts

@@ -0,0 +1,22 @@
+/**
+ * The pull request's own changes, fingerprinted from the checkout: what it
+ * would merge into `base`, as `git patch-id` sees it (CHECKPOINT-12.4 to
+ * 12.6). Merging a newer `base` in, or rebasing onto it, leaves the
+ * fingerprint as it was; resolving a conflict, a whitespace change or a new
+ * commit of the branch's own gives a new one.
+ *
+ * `--verbatim` keeps whitespace, and `-U0` drops the context lines and
+ * leaves line numbers only in the hunk headers, which `patch-id` ignores, so
+ * what moved under the change doesn't count as changing it. The cost, an
+ * accepted limit (12.4.0): a fix that only moves the branch's own lines
+ * elsewhere in the same file keeps the fingerprint too.
+ *
+ * Null when any step fails, the fetch included: the work is then recorded
+ * without one, and the checkpoint counts the pull request as changed
+ * (12.6). Never throws.
+ */
+export declare function ownChangesOf(cwd: string, base: string): {
+    commit: string;
+    patchId: string;
+} | null;
+//# sourceMappingURL=own-changes.d.ts.map

package/dist/commands/solution/own-changes.js

@@ -0,0 +1,78 @@
+import { spawnSync } from "node:child_process";
+/**
+ * The pull request's own changes, fingerprinted from the checkout: what it
+ * would merge into `base`, as `git patch-id` sees it (CHECKPOINT-12.4 to
+ * 12.6). Merging a newer `base` in, or rebasing onto it, leaves the
+ * fingerprint as it was; resolving a conflict, a whitespace change or a new
+ * commit of the branch's own gives a new one.
+ *
+ * `--verbatim` keeps whitespace, and `-U0` drops the context lines and
+ * leaves line numbers only in the hunk headers, which `patch-id` ignores, so
+ * what moved under the change doesn't count as changing it. The cost, an
+ * accepted limit (12.4.0): a fix that only moves the branch's own lines
+ * elsewhere in the same file keeps the fingerprint too.
+ *
+ * Null when any step fails, the fetch included: the work is then recorded
+ * without one, and the checkpoint counts the pull request as changed
+ * (12.6). Never throws.
+ */
+export function ownChangesOf(cwd, base) {
+    try {
+        // The base as the repository has it now: an older one would put its
+        // newer commits, merged into the branch, among the branch's own.
+        const fetched = run(cwd, [
+            "fetch",
+            "--quiet",
+            "origin",
+            `+refs/heads/${base}:refs/remotes/origin/${base}`,
+        ]);
+        if (!fetched)
+            return null;
+        const commit = text(run(cwd, ["rev-parse", "--verify", "--quiet", "HEAD"]));
+        if (!commit)
+            return null;
+        const mergeBase = text(run(cwd, ["merge-base", "HEAD", `refs/remotes/origin/${base}`]));
+        if (!mergeBase)
+            return null;
+        const diff = run(cwd, [
+            "diff",
+            "--no-ext-diff",
+            "--no-textconv",
+            "--no-color",
+            "--binary",
+            "-U0",
+            mergeBase,
+            commit,
+        ]);
+        if (!diff)
+            return null;
+        // `patch-id` prints nothing for an empty diff.
+        if (diff.length === 0)
+            return { commit, patchId: "empty" };
+        const id = run(cwd, ["patch-id", "--verbatim"], diff);
+        if (!id)
+            return null;
+        // A diff it gives no id for, as one only changing a file's mode, can't
+        // be told from another: no fingerprint.
+        const patchId = text(id)?.split(/\s+/)[0];
+        return patchId ? { commit, patchId } : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Git's stdout, as bytes, or null when it failed. */
+function run(cwd, args, input) {
+    const ran = spawnSync("git", args, {
+        cwd,
+        input,
+        maxBuffer: 1024 * 1024 * 1024,
+        // A fetch that wants a password fails rather than waiting for one.
+        env: { ...process.env, GIT_TERMINAL_PROMPT: "0" },
+    });
+    return ran.status === 0 && !ran.error ? ran.stdout : null;
+}
+function text(out) {
+    return out?.toString("utf8").trim() || null;
+}
+//# sourceMappingURL=own-changes.js.map

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

@@ -1,8 +1,12 @@
 import { type Where, type WhereOptions } from "./run-file.js";
-/** The solution's pull request: its number and where it opens. */
+/**
+ * The solution's pull request: its number and where it opens, and, when
+ * checked by its number, the branch it merges into (CHECKPOINT-12.4).
+ */
 export type PullRequest = {
     url: string;
     number: number;
+    base?: string;
 };
 /** The command that opens the solution's pull request and prints its reference. */
 export declare const OPEN_IT = "dotreq solution pr open";

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

@@ -20,6 +20,7 @@ export async function pullRequestCommand(options) {
         const pushed = await pushWork(solutionClient(), {
             solutionId: where.solutionId,
             branch: where.branch,
+            agent: where.agent,
         });
         if (!pushed.ok) {
             throw new Error(pushed.tell
@@ -91,9 +92,13 @@ export async function checkPullRequest(where, number) {
     return pullRequest;
 }
 function pullRequestIn(said) {
-    return said.url && typeof said.number === "number"
-        ? { url: said.url, number: said.number }
-        : null;
+    if (!said.url || typeof said.number !== "number")
+        return null;
+    return {
+        url: said.url,
+        number: said.number,
+        ...(typeof said.base === "string" && said.base ? { base: said.base } : {}),
+    };
 }
 /**
  * Ask the app's pull-request route, on the project's credentials: with the

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

@@ -35,6 +35,7 @@ export type PushOutcome = {
 export declare function pushWork(client: Client, where: {
     solutionId: string;
     branch: string;
+    agent?: string;
 }, cwd?: string): Promise<PushOutcome>;
 /** Push before a record, or refuse it with what the agent is to do (SOLBRANCH-3). */
 export declare function pushBeforeRecord(client: Client, where: Where): Promise<void>;

package/dist/commands/solution/pushing.js

@@ -26,6 +26,9 @@ export async function pushWork(client, where, cwd = process.cwd()) {
                 branch,
                 before: pushed.before,
                 after: pushed.after,
+                // Which agent pushed, so the solution's agent is told of others'
+                // pushes since its last turn (SOLBRANCH-2.4.0).
+                ...(where.agent ? { agent: where.agent } : {}),
             });
             return { ok: true, pushed: true };
         case "nothing to push":
@@ -83,6 +86,7 @@ export async function pushBeforeRecord(client, where) {
     const outcome = await pushWork(client, {
         solutionId: where.solutionId,
         branch: where.branch,
+        agent: where.agent,
     });
     if (!outcome.ok)
         throw new Error(outcome.tell);

package/dist/commands/solution/stall.js

@@ -22,6 +22,7 @@ export async function stallCommand(reason, options) {
         const pushed = await pushWork(client, {
             solutionId,
             branch: where.branch,
+            agent,
         });
         if (!pushed.ok)
             said = withUnpushed(said, pushed.why);

package/package.json

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