@bakers-build/addon-forge 0.9.1-next.9 → 0.10.1-next.1

package/dist/src/backend.d.ts

@@ -42,9 +42,11 @@ export interface ForgeBackend {
         title: string;
         body: string;
     }): Promise<ForgePr>;
+    /** Also retargets the PR to `base`, which may have moved since it opened. */
     updatePr(pr: ForgePr, input: {
         title: string;
         body: string;
+        base: string;
     }): Promise<ForgePr>;
     openPrsWithBase(base: string): Promise<ForgePr[]>;
     /**

package/dist/src/tools.js

@@ -17,6 +17,25 @@ function runOf(req) {
         ...(t.targetBranch ? { targetBranch: t.targetBranch } : {}),
     };
 }
+/**
+ * Where `branch` merges: a variant into the ticket branch, the ticket branch into
+ * the ticket's current target as the server returns it now. A failed read refuses;
+ * the run copy may predate an environment added during the run.
+ */
+async function currentBase(req, branch, run) {
+    if (branch !== run.branchName)
+        return derivedBase(branch, run);
+    const refuse = (why) => new Error(`forge: the ticket's current target_branch could not be read from the server (${why}); nothing was sent`);
+    if (!req.currentTicket)
+        throw refuse('no server read for this call');
+    const t = await req.currentTicket().catch((err) => {
+        throw refuse(err instanceof Error ? err.message : String(err));
+    });
+    const target = t.targetBranch ?? t.baseBranch;
+    if (!target)
+        throw refuse('no target_branch or base_branch returned');
+    return target;
+}
 function ownedBranch(req, run) {
     const branch = req.args.branch ?? run.branchName;
     if (!isOwned(branch, run.branchName))
@@ -98,13 +117,14 @@ export function forgeTools(deps) {
             const run = runOf(req);
             const branch = ownedBranch(req, run);
             const body = req.args.body ?? '';
+            const base = await currentBase(req, branch, run);
             const b = await backend();
             const open = await b.findOpenPr(branch);
             const pr = open
-                ? await b.updatePr(open, { title, body })
+                ? await b.updatePr(open, { title, body, base })
                 : await b.createPr({
                     head: branch,
-                    base: derivedBase(branch, run),
+                    base,
                     title,
                     body,
                 });
@@ -137,7 +157,7 @@ export function forgeTools(deps) {
         forge_merge: async (req) => {
             const run = runOf(req);
             const branch = ownedBranch(req, run);
-            const base = derivedBase(branch, run);
+            const base = await currentBase(req, branch, run);
             const b = await backend();
             const pr = await b.findOpenPr(branch);
             if (!pr)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/addon-forge",
-  "version": "0.9.1-next.9",
+  "version": "0.10.1-next.1",
   "description": "bakers.build forge tools: a sandboxed run fetches, pushes its own branches, opens its PR/MR, reads checks and merges through the conductor, which holds the token. Backends implement the ForgeBackend contract (./backend).",
   "type": "module",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "directory": "bakers-cli/addons/forge"
   },
   "peerDependencies": {
-    "@bakers-build/conductor": "^0.9.1-next.9",
-    "@bakers-build/core": "^0.9.1-next.9"
+    "@bakers-build/conductor": "^0.10.1-next.1",
+    "@bakers-build/core": "^0.10.1-next.1"
   },
   "bakersBuild": {
-    "commit": "fa0565441ae1aee6535c9205b3a37f87e9b52054",
+    "commit": "f9cee7721df536cac94906e7278d60a13e202502",
     "channel": "next"
   }
 }