@outerlayer/cli 0.37.0-next.20261104205100 → 0.37.0-next.20261104233800

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.
@@ -1 +1 @@
1
- {"id":"2026-11-04T20:56:44.572Z","root":"/home/runner/work/outerlayer/outerlayer","pkg":"outerlayer"}
1
+ {"id":"2026-11-04T23:44:49.729Z","root":"/home/runner/work/outerlayer/outerlayer","pkg":"outerlayer"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@outerlayer/cli",
3
- "version": "0.37.0-next.20261104205100",
3
+ "version": "0.37.0-next.20261104233800",
4
4
  "description": "OuterLayer CLI — commands: init, claude, connect, doctor, login, logout, sync, daemon (alias: watch), emit, demo, findings, work, spec, runner, hooks, mcp, context. Capture and sync coding-agent sessions, and record proof of factory work.",
5
5
  "license": "Apache-2.0",
6
6
  "author": "Magu Studios, Inc.",
@@ -229,11 +229,14 @@ before the push.
229
229
  pull request, and the factory host starts a run that fixes a check that
230
230
  fails there. Run here, they hold the push for up to an hour while the base
231
231
  branch moves.
232
- 5. Check for a conflict with the base branch, and merge it in only when there
233
- is one, as
234
- `.outerlayer/skills/outerlayer-cli/references/merge-base-branch.md` says.
235
- Resolve every conflict on the branch, never in a web editor.
236
- 6. Push. The hooks run, and you never bypass them.
232
+ 5. Check for a conflict with the base branch and push, in the one command
233
+ `.outerlayer/skills/outerlayer-cli/references/merge-base-branch.md`
234
+ gives. The push runs only when the merge is clean. Never push in a
235
+ separate command.
236
+ 6. When that command did not push because the branch conflicts, merge the
237
+ base branch as merge-base-branch.md says. Resolve every conflict on the
238
+ branch, never in a web editor. Gate the merge's diff, then push. The hooks
239
+ run, and you never bypass them.
237
240
 
238
241
  A check that fails is a red gate, and you never push over it.
239
242
 
@@ -8,6 +8,12 @@ for both.
8
8
  Merge the base branch. Never rebase, and never force-push. A merge keeps the
9
9
  commits a reviewer already read and keeps review comments on their lines.
10
10
 
11
+ ## Contents
12
+
13
+ - A build's last sync: merge only on a conflict
14
+ - The merge
15
+ - When you cannot resolve it
16
+
11
17
  ## A build's last sync: merge only on a conflict
12
18
 
13
19
  A build checks for a conflict as the last step before its push, after its
@@ -15,17 +21,23 @@ gate passed. It merges the base branch only when the two conflict. CI tests a
15
21
  pull request merged into its base, so a branch that merges cleanly needs no
16
22
  merge to be tested. A branch that conflicts gets no CI run at all.
17
23
 
18
- 1. Fetch the base branch and check the merge without changing the branch.
19
-
20
- git fetch origin <base>
21
- git merge-tree --write-tree HEAD origin/<base>
22
-
23
- 2. When the command exits 0, the merge is clean. Merge nothing, and push the
24
- branch as step 7 of the merge says.
25
- 3. When it exits 1, the branch conflicts with the base. Follow every step
26
- of the merge, then push straight after the gate passes. When the base moves again
27
- during that gate, push anyway. The build's mergeability check catches a new
28
- conflict once the pull request is open.
24
+ 1. Fetch the base branch, check the merge without changing the branch, and
25
+ push, all in this one command:
26
+
27
+ git fetch origin <base> && git merge-tree --write-tree HEAD origin/<base> >/dev/null && git push origin HEAD
28
+
29
+ The push runs only when the merge is clean. Never run the check and the
30
+ push as separate commands, or join them with `;`. Then a branch that
31
+ conflicts is pushed anyway, and its pull request opens with a conflict.
32
+ 2. When the command pushed, the sync is done. Merge nothing.
33
+ 3. When `git merge-tree` exits 1, the branch conflicts with the base, and
34
+ nothing was pushed. Follow every step of the merge, then push straight
35
+ after the gate passes. When the base moves again during that gate, push
36
+ anyway. The build's mergeability check catches a new conflict once the
37
+ pull request is open.
38
+ 4. When the fetch fails, or `git merge-tree` exits with any other code,
39
+ nothing was pushed. Run the command again. When it fails a second time,
40
+ hand off as the calling skill says.
29
41
 
30
42
  A run that resolves a merge conflict on an open pull request skips this check
31
43
  and follows every step of the merge.