mergestorm 0.3.31 → 0.3.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/api.js +6 -0
- package/dist/stack-dto.d.ts +2 -0
- package/dist/ui/banner.js +3 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -45,7 +45,7 @@ On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a comp
|
|
|
45
45
|
|
|
46
46
|
```
|
|
47
47
|
╭──────────────────────────────────────────────────────────────────────────────╮
|
|
48
|
-
│ ▀▀▀▀▀▀▀▀▀▀▘ mergestorm v0.3.
|
|
48
|
+
│ ▀▀▀▀▀▀▀▀▀▀▘ mergestorm v0.3.32 │
|
|
49
49
|
│ ▀▀▀▀▀▀▀▀▀ ● msk_live_… · maelstrom │
|
|
50
50
|
│ ▀▀▀▀▀▀ [████████░░░░░░░░░░░░░░░░░░░░░░] 25% used │
|
|
51
51
|
│ ▝▀▀▀▀▀ local reviews + stacked PRs · mergestorm.ai │
|
package/dist/api.js
CHANGED
|
@@ -570,6 +570,12 @@ async function queueMutation(route, failLabel, cfg) {
|
|
|
570
570
|
}
|
|
571
571
|
throw new CommandError("Merge queue API is not available on this server yet. Deploy the API update or use the dashboard.");
|
|
572
572
|
}
|
|
573
|
+
if (status === 409) {
|
|
574
|
+
const refusal = body;
|
|
575
|
+
if (refusal?.error === "conflict_unchanged" && typeof refusal.message === "string") {
|
|
576
|
+
throw new CommandError(refusal.message);
|
|
577
|
+
}
|
|
578
|
+
}
|
|
573
579
|
if (status < 200 || status >= 300) {
|
|
574
580
|
throw new CommandError(`${failLabel} (HTTP ${status}): ${JSON.stringify(body)}`);
|
|
575
581
|
}
|
package/dist/stack-dto.d.ts
CHANGED
|
@@ -390,6 +390,8 @@ export type MergeQueueBounceDetail = {
|
|
|
390
390
|
conflictBranch?: string;
|
|
391
391
|
conflictDetail?: string;
|
|
392
392
|
conflictPaths?: string[];
|
|
393
|
+
baseBranch?: string;
|
|
394
|
+
baseSha?: string;
|
|
393
395
|
message?: string;
|
|
394
396
|
warning?: string;
|
|
395
397
|
batch?: MergeQueueBounceBatch;
|
package/dist/ui/banner.js
CHANGED
|
@@ -126,6 +126,9 @@ const WHATS_NEW = {
|
|
|
126
126
|
"0.3.31": [
|
|
127
127
|
"every stack Next line offers mg stack watch",
|
|
128
128
|
],
|
|
129
|
+
"0.3.32": [
|
|
130
|
+
"queue add explains a held merge conflict",
|
|
131
|
+
],
|
|
129
132
|
};
|
|
130
133
|
function densityFromVariant(variant) {
|
|
131
134
|
if (variant === "mini" || variant === "nano")
|
package/package.json
CHANGED