@neocompose/cli 0.36.9 → 0.36.11
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/package.json
CHANGED
|
@@ -9,7 +9,7 @@ description: >-
|
|
|
9
9
|
`@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
|
|
10
10
|
---
|
|
11
11
|
|
|
12
|
-
<!-- reviewed-through-cli: 0.36.
|
|
12
|
+
<!-- reviewed-through-cli: 0.36.11 -->
|
|
13
13
|
|
|
14
14
|
# Neo Compose CLI
|
|
15
15
|
|
|
@@ -210,10 +210,13 @@ Conflict source deliberately fails compilation. Edit the desired final source,
|
|
|
210
210
|
or use `neo resolve --mine|--theirs` as a whole-side convenience. Then pull,
|
|
211
211
|
review, dry-run, and push again.
|
|
212
212
|
|
|
213
|
+
Either `neo resolve` side adopts the server side as the new base for every
|
|
214
|
+
conflict it settles, so the next push plans against what the server holds:
|
|
215
|
+
`--theirs` reads clean afterwards, `--mine` reads as an ordinary local update.
|
|
213
216
|
Server-derived compilation metadata is not authored source and does not create
|
|
214
|
-
a pull conflict by itself
|
|
215
|
-
conflict without writing source markers, either
|
|
216
|
-
|
|
217
|
+
a pull conflict by itself; if an older CLI retained such a metadata-only
|
|
218
|
+
conflict without writing source markers, either side settles it the same way
|
|
219
|
+
while preserving any real local source edit.
|
|
217
220
|
|
|
218
221
|
`neo push` sends the authenticated semantic diff plus a deterministic source
|
|
219
222
|
hash, while the server recompiles the changed NeoScript bodies and
|
|
@@ -83,7 +83,7 @@ wrappers.
|
|
|
83
83
|
The marker near the top of `SKILL.md` must exactly match the package version:
|
|
84
84
|
|
|
85
85
|
```html
|
|
86
|
-
<!-- reviewed-through-cli: 0.36.
|
|
86
|
+
<!-- reviewed-through-cli: 0.36.11 -->
|
|
87
87
|
```
|
|
88
88
|
|
|
89
89
|
The quoted version above is checked too, so this instruction cannot go stale
|
|
@@ -80,9 +80,17 @@ Resolve source conflicts by editing the final intended source. Use
|
|
|
80
80
|
choice. Pull, inspect, dry-run, and retry; there is no force-CAS path.
|
|
81
81
|
|
|
82
82
|
Compiled initializer IR is server-owned and does not participate in authored
|
|
83
|
-
three-way merge decisions. `neo resolve`
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
three-way merge decisions. Either `neo resolve` side adopts the server side as
|
|
84
|
+
the new base for every conflict it settles — `--theirs` then reads clean, and
|
|
85
|
+
`--mine` keeps the local text as an ordinary update on top of that base. That
|
|
86
|
+
includes metadata-only conflict bookkeeping left by an older pull when no
|
|
87
|
+
source marker exists; adopting the server base never overwrites tracked
|
|
88
|
+
source.
|
|
89
|
+
|
|
90
|
+
A `value-base-desync` error means the workspace base no longer names value
|
|
91
|
+
rows its own file projection holds, so the plan would delete live server rows.
|
|
92
|
+
Nothing is planned in that state; run `neo pull` and retry. The same message
|
|
93
|
+
as a warning reports the inconsistency without blocking.
|
|
86
94
|
|
|
87
95
|
For `base-hash-conflict`, pull and merge. For `version-bump-required`, inspect
|
|
88
96
|
the classification and use `neo push --accept-bump` only when the bump is
|