@neocompose/cli 0.38.4 → 0.38.6

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@neocompose/cli",
3
- "version": "0.38.4",
3
+ "version": "0.38.6",
4
4
  "description": "Neo Compose native project-source CLI with bidirectional sync.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -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.38.4 -->
12
+ <!-- reviewed-through-cli: 0.38.6 -->
13
13
 
14
14
  # Neo Compose CLI
15
15
 
@@ -120,7 +120,9 @@ Production `.neo`/`.neoflow` files and supported managed binaries are tracked.
120
120
  Colocated `.spec.neo` files are test-only and never enter status, source hashes,
121
121
  pull/reset, or push.
122
122
  Normal pull preserves declaration placement and spelling by stable ID when it
123
- can. Force/reset may regroup source into the canonical layout.
123
+ can. Force/reset regenerates canonical text while retaining the declaration
124
+ file grouping recorded by the workspace; declarations with no prior placement
125
+ use the canonical per-declaration layout.
124
126
 
125
127
  ## Load the focused contract you need
126
128
 
@@ -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.38.4 -->
86
+ <!-- reviewed-through-cli: 0.38.6 -->
87
87
  ```
88
88
 
89
89
  The quoted version above is checked too, so this instruction cannot go stale
@@ -27,7 +27,9 @@ neo push --dry-run --force-recompile
27
27
 
28
28
  Use `neo pull --regenerate-source-names` to refresh readable naming while
29
29
  retaining normal merge behavior. Use `--reset` to regenerate canonical source
30
- and managed binaries. Use `--force` only to discard local edits for the server
30
+ and managed binaries. Reset retains declaration file grouping already recorded
31
+ by the workspace, while declarations with no prior placement use the canonical
32
+ per-declaration layout. Use `--force` only to discard local edits for the server
31
33
  version. Normal pulls persist a transaction cursor and fetch only changed
32
34
  records; an undo/reset metadata change invalidates the cursor and causes a safe
33
35
  full-snapshot fallback.
@@ -92,6 +94,13 @@ rows its own file projection holds, so the plan would delete live server rows.
92
94
  Nothing is planned in that state; run `neo pull` and retry. The same message
93
95
  as a warning reports the inconsistency without blocking.
94
96
 
97
+ When pull conflicts with a server-side deletion, keeping the authored record
98
+ restores it as an explicit create guarded by an absent-record CAS check;
99
+ removing it from the resolved source accepts the deletion without sending a
100
+ write. Pull also warns immediately when a conflicted record's retained local
101
+ base strands newly downloaded descendant value rows. Resolve that conflict
102
+ with `neo resolve --mine` or `neo resolve --theirs` before pushing.
103
+
95
104
  For `base-hash-conflict`, pull and merge. For `version-bump-required`, inspect
96
105
  the classification and use `neo push --accept-bump` only when the bump is
97
106
  intended.