mergestorm 0.3.6 → 0.3.7
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/LICENSE +21 -0
- package/README.md +21 -7
- package/dist/commands/login.js +1 -1
- package/dist/ui/banner.js +4 -0
- package/package.json +8 -6
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 Margin Systems
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Mergestorm CLI
|
|
2
2
|
|
|
3
|
-
Review a local git diff with
|
|
3
|
+
Review a local git diff with Mergestorm without opening a GitHub PR — for local loops and CI. Diffs are reviewed by the same engine as PR reviews and each review consumes one standard credit.
|
|
4
4
|
|
|
5
5
|
Requires **Node.js 22+**.
|
|
6
6
|
|
|
@@ -24,6 +24,19 @@ mg login
|
|
|
24
24
|
|
|
25
25
|
After install, both `mergestorm` and `mg` invoke the same CLI.
|
|
26
26
|
|
|
27
|
+
## Source
|
|
28
|
+
|
|
29
|
+
Public source (MIT): [github.com/marginsystems/mergestorm-cli](https://github.com/marginsystems/mergestorm-cli).
|
|
30
|
+
Tags there match npm versions (`v0.3.7`, …).
|
|
31
|
+
|
|
32
|
+
```bash
|
|
33
|
+
git clone https://github.com/marginsystems/mergestorm-cli.git
|
|
34
|
+
cd mergestorm-cli
|
|
35
|
+
npm install
|
|
36
|
+
npm run build
|
|
37
|
+
node dist/cli.js --help
|
|
38
|
+
```
|
|
39
|
+
|
|
27
40
|
### From this monorepo (development / local UI testing)
|
|
28
41
|
|
|
29
42
|
You do **not** need to bump/publish npm to try shell layout changes. From the repo root:
|
|
@@ -48,14 +61,14 @@ mergestorm # uses your local build
|
|
|
48
61
|
On a TTY, bare `mergestorm` (or `mergestorm shell`) opens a branded REPL: a **full-width** welcome panel (logo + status on the left, tips / what's new on the right) and a **full-width** bordered input box with a live `/` slash-command dropdown. Non-TTY (CI/pipes) prints usage instead — no hanging prompt.
|
|
49
62
|
|
|
50
63
|
```
|
|
51
|
-
╭─ mergestorm v0.3.
|
|
64
|
+
╭─ mergestorm v0.3.7 ──────────────────────────────────────────────────────────╮
|
|
52
65
|
│ ▟██████████▛ Tips for getting started │
|
|
53
66
|
│ ▜████████▛ review review main...HEAD │
|
|
54
67
|
│ ▝▜████▛▘ stack create → submit → restack → land │
|
|
55
68
|
│ ▜██▛ /help list all commands │
|
|
56
69
|
│ ██ │
|
|
57
|
-
│ ▝▘ What's new in v0.3.
|
|
58
|
-
│ ● msk… · maelstrom •
|
|
70
|
+
│ ▝▘ What's new in v0.3.7 │
|
|
71
|
+
│ ● msk… · maelstrom • MIT license + public source (mergestorm-cli) │
|
|
59
72
|
│ [████░░░░░░░░░░] 12% used │
|
|
60
73
|
╰──────────────────────────────────────────────────────────────────────────────╯
|
|
61
74
|
mergestorm
|
|
@@ -106,7 +119,7 @@ mergestorm stack reset --force Clear local authoring state (not branches/PRs)
|
|
|
106
119
|
|
|
107
120
|
`stack create` is local-only: it checks out a new branch from the current tip (or `--onto <branch>`), discovers trunk (`main` / `master` / `origin/HEAD`, overridable with `--trunk`), and records `{ branch, parentBranch }` in CLI-managed state under **`~/.mergestorm/stacks/<repo-id>/stack.json`**. The CLI updates this automatically; never edit it. Linked worktrees share state, while independent clones remain isolated. Creating onto trunk with a non-empty active stack starts a new one. No repository file, GitHub call, or API call is made.
|
|
108
121
|
|
|
109
|
-
`stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push/PR auth is your local `git` + `gh auth` — not a
|
|
122
|
+
`stack submit` walks the **active** local stack: `git push -u origin` each layer, opens a PR with `gh` (`--base` = parent or trunk; skips heads that already have an open PR; body from the tip commit — Summary + Test plan, preserving Fixes/Closes/Resolves), registers the stack with `POST /api/v1/stacks/adopt` internally (Mergestorm API key), then drops that local stack entry so the next create onto trunk is clean. Push/PR auth is your local `git` + `gh auth` — not a GitHub App installation token.
|
|
110
123
|
|
|
111
124
|
Legacy repo-local `.mergestorm/stack.json` state migrates automatically on the next stack command. If local authoring state is stale or malformed, use `mg stack reset --force`; this clears only pre-submit CLI state and never deletes branches, PRs, or registered stacks.
|
|
112
125
|
|
|
@@ -154,5 +167,6 @@ Require a logged-in key and API support for `GET /api/v1/me` and `GET /api/v1/re
|
|
|
154
167
|
|
|
155
168
|
## See also
|
|
156
169
|
|
|
157
|
-
- [
|
|
170
|
+
- [Public source — mergestorm-cli](https://github.com/marginsystems/mergestorm-cli)
|
|
158
171
|
- [Docs — Review Jobs API & CLI](https://mergestorm.ai/docs#review-jobs-api) — product docs on the site.
|
|
172
|
+
- [npm — mergestorm](https://www.npmjs.com/package/mergestorm)
|
package/dist/commands/login.js
CHANGED
|
@@ -25,7 +25,7 @@ async function loginWithKey(existingRl) {
|
|
|
25
25
|
const rl = existingRl ?? createInterface({ input, output });
|
|
26
26
|
const ownRl = !existingRl;
|
|
27
27
|
try {
|
|
28
|
-
const key = (await rl.question("Paste your
|
|
28
|
+
const key = (await rl.question("Paste your Mergestorm API key (msk_live_...): ")).trim();
|
|
29
29
|
if (!key.startsWith("msk_live_")) {
|
|
30
30
|
throw new CommandError("Key should start with msk_live_");
|
|
31
31
|
}
|
package/dist/ui/banner.js
CHANGED
|
@@ -50,6 +50,10 @@ const WHATS_NEW = {
|
|
|
50
50
|
"Stack state under ~/.mergestorm/stacks/ (multi-stack + legacy migrate)",
|
|
51
51
|
"`stack reset --force` clears stale local authoring state",
|
|
52
52
|
],
|
|
53
|
+
"0.3.7": [
|
|
54
|
+
"MIT license + public source at github.com/marginsystems/mergestorm-cli",
|
|
55
|
+
"npm repository/bugs point at the public CLI repo",
|
|
56
|
+
],
|
|
53
57
|
};
|
|
54
58
|
function formatStatusLines(me, key, barWidth) {
|
|
55
59
|
if (!key) {
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mergestorm",
|
|
3
|
-
"version": "0.3.
|
|
4
|
-
"description": "
|
|
3
|
+
"version": "0.3.7",
|
|
4
|
+
"description": "Mergestorm CLI — interactive shell and one-shot review commands",
|
|
5
|
+
"license": "MIT",
|
|
5
6
|
"type": "module",
|
|
6
7
|
"bin": {
|
|
7
8
|
"mergestorm": "./dist/cli.js",
|
|
@@ -10,14 +11,15 @@
|
|
|
10
11
|
"homepage": "https://mergestorm.ai/docs#review-jobs-api",
|
|
11
12
|
"repository": {
|
|
12
13
|
"type": "git",
|
|
13
|
-
"url": "git+https://github.com/marginsystems/mergestorm.git"
|
|
14
|
-
"directory": "packages/mergestorm-cli"
|
|
14
|
+
"url": "git+https://github.com/marginsystems/mergestorm-cli.git"
|
|
15
15
|
},
|
|
16
16
|
"bugs": {
|
|
17
|
-
"url": "https://github.com/marginsystems/mergestorm/issues"
|
|
17
|
+
"url": "https://github.com/marginsystems/mergestorm-cli/issues"
|
|
18
18
|
},
|
|
19
19
|
"files": [
|
|
20
|
-
"dist"
|
|
20
|
+
"dist",
|
|
21
|
+
"LICENSE",
|
|
22
|
+
"README.md"
|
|
21
23
|
],
|
|
22
24
|
"scripts": {
|
|
23
25
|
"build": "tsc -p tsconfig.build.json",
|