@neocompose/cli 0.36.10 → 0.36.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.36.10",
+  "version": "0.36.12",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.36.10 -->
+<!-- reviewed-through-cli: 0.36.12 -->
 
 # Neo Compose CLI
 
@@ -210,10 +210,13 @@ Conflict source deliberately fails compilation. Edit the desired final source,
 or use `neo resolve --mine|--theirs` as a whole-side convenience. Then pull,
 review, dry-run, and push again.
 
+Either `neo resolve` side adopts the server side as the new base for every
+conflict it settles, so the next push plans against what the server holds:
+`--theirs` reads clean afterwards, `--mine` reads as an ordinary local update.
 Server-derived compilation metadata is not authored source and does not create
-a pull conflict by itself. If an older CLI retained such a metadata-only
-conflict without writing source markers, either `neo resolve` side accepts the
-newer server metadata as the base while preserving any real local source edit.
+a pull conflict by itself; if an older CLI retained such a metadata-only
+conflict without writing source markers, either side settles it the same way
+while preserving any real local source edit.
 
 `neo push` sends the authenticated semantic diff plus a deterministic source
 hash, while the server recompiles the changed NeoScript bodies and

package/skills/neocompose-cli/references/cli-development.md

@@ -83,7 +83,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.36.10 -->
+<!-- reviewed-through-cli: 0.36.12 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

package/skills/neocompose-cli/references/commands-and-sync.md

@@ -80,9 +80,17 @@ Resolve source conflicts by editing the final intended source. Use
 choice. Pull, inspect, dry-run, and retry; there is no force-CAS path.
 
 Compiled initializer IR is server-owned and does not participate in authored
-three-way merge decisions. `neo resolve` also repairs metadata-only conflict
-bookkeeping left by an older pull when no source marker exists; accepting the
-newer server metadata does not overwrite the tracked source.
+three-way merge decisions. Either `neo resolve` side adopts the server side as
+the new base for every conflict it settles — `--theirs` then reads clean, and
+`--mine` keeps the local text as an ordinary update on top of that base. That
+includes metadata-only conflict bookkeeping left by an older pull when no
+source marker exists; adopting the server base never overwrites tracked
+source.
+
+A `value-base-desync` error means the workspace base no longer names value
+rows its own file projection holds, so the plan would delete live server rows.
+Nothing is planned in that state; run `neo pull` and retry. The same message
+as a warning reports the inconsistency without blocking.
 
 For `base-hash-conflict`, pull and merge. For `version-bump-required`, inspect
 the classification and use `neo push --accept-bump` only when the bump is
@@ -124,12 +132,24 @@ neo merge <branch> [--dry-run] [--migrate]
 neo release cut [--bump major|minor|patch] [--dry-run]
 neo history inspect
 neo history log
+neo history prune [--project <id|@latest|@current>]
+neo history flatten [--project <id|@latest|@current>] --version <id|@latest|@current>
+neo history apply --plan <plan-id> [--confirm-scope <project-id>[/<version-id>]]
+neo history status --run <run-id>
+neo history resume --run <run-id>
 ```
 
 Treat branches as copy-on-write forks and releases as immutable snapshots. The
 server derives the minimum compatibility bump; a caller may only raise it.
 Require the release login profile for release operations.
 
+History rewrites require project owner or admin authority. `prune` and
+`flatten` create immutable plans without deleting anything. `apply` starts the
+destructive run after the plan has sealed. Production also requires the exact
+scope confirmation shown by the plan and a recent configured backup. CLI
+tokens issued before 0.36.12 do not hold the history write grant, so run
+`neo logout` followed by `neo login` once after upgrading.
+
 ## Authentication and automation
 
 ```sh