@outerlayer/cli 0.36.1-next.20261104161854 → 0.36.1-next.20261104165351

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-04T16:36:08.441Z","root":"/home/runner/work/outerlayer/outerlayer","pkg":"outerlayer"}
1
+ {"id":"2026-11-04T16:59:14.748Z","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.36.1-next.20261104161854",
3
+ "version": "0.36.1-next.20261104165351",
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.",
@@ -57,7 +57,7 @@ repository. Commit and push in each checkout you change, to its own branch only.
57
57
  pre-push gate in the foreground. Name the base sha in the merge commit.
58
58
  Push, then answer the threads.
59
59
  **Hand off a conflict you cannot resolve.** If the resolution needs a
60
- product decision, or the gate stays red after one fix, abort the merge.
60
+ product decision, or the same gate failure comes back after its fix, abort the merge.
61
61
  Push nothing. Post on the general thread with `--ready`. Name the
62
62
  conflicting files, their base commits and the decision needed.
63
63
  Tell the person to fail the general thread with their answer.
@@ -15,9 +15,11 @@ commits a reviewer already read and keeps review comments on their lines.
15
15
 
16
16
  git fetch origin <base>
17
17
 
18
- 2. Record the base commit you merge. Read it after the fetch.
18
+ 2. Record the base commit you merge and the branch's head. Read both after
19
+ the fetch. You need the head to undo the merge.
19
20
 
20
21
  git rev-parse origin/<base>
22
+ git rev-parse HEAD
21
23
 
22
24
  3. Merge it into the checked-out branch, and stop before git commits.
23
25
 
@@ -34,21 +36,36 @@ commits a reviewer already read and keeps review comments on their lines.
34
36
  resolved with `git add <file>` only when its code and its tests agree
35
37
  with both sides.
36
38
 
37
- 5. Run the repository's pre-push gate in the foreground, with the maximum
38
- timeout. It names its own command in the repository's instructions file.
39
- Wait for it to end. If the gate fails, fix the cause and run it again once.
40
- A second failure is a hand-off, not a third try.
41
-
42
- 6. Commit the merge. Name the base sha from step 2 in the message, so a reader
43
- can find the exact base commit.
39
+ 5. Commit the merge before you run the gate. Name the base sha from step 2 in
40
+ the message, so a reader can find the exact base commit.
44
41
 
45
42
  git commit -m "Merge <base> at <base sha> into <branch>"
46
43
 
44
+ The gate then judges the branch against the new base, not every change
45
+ the base made since the branch started. A fix after a failed run has a
46
+ commit to start from.
47
+
48
+ 6. Run the repository's pre-push gate in the foreground, with the maximum
49
+ timeout. It names its own command in the repository's instructions file.
50
+ Wait for it to end. This first run checks the whole branch, even when an
51
+ earlier run recorded a passed commit.
52
+ - **When the gate fails,** fix the cause and commit the fix. Run the gate
53
+ again as the repository's instructions say for a run after a fix. When
54
+ they say nothing, use the same scope as the run that failed.
55
+ - **A test that fails in the gate and passes when you run it alone** is
56
+ flaky. Do not change it to make it pass. Record it as a factory problem.
57
+ Run the gate again with the same scope as the run that failed.
58
+ - **Hand off** when the same failure comes back after its fix, or when a
59
+ fix needs a product decision.
60
+ - **When a run passes,** write its commit to
61
+ `"$(git rev-parse --absolute-git-dir)/build-reports/gate-passed"`.
62
+
47
63
  7. Push the branch. The hooks run, and you never bypass them. A push goes to
48
64
  the pull request's own branch only.
49
65
 
50
66
  ## When you cannot resolve it
51
67
 
52
- Abort the merge with `git merge --abort`. The branch returns to the state it
53
- had before step 3. Push nothing. Hand the item to a person in the way the
54
- calling skill says.
68
+ Undo the merge. Before the merge commit, run `git merge --abort`. After it,
69
+ run `git reset --hard <head from step 2>`. Either way, the branch returns to
70
+ the state it had before step 3. Push nothing. Hand the item to a person in
71
+ the way the calling skill says.