@samva/cli 0.5.0 → 0.6.0

package/AGENTS.md

@@ -57,6 +57,8 @@ repository. `samva templates clone <project-or-template-id>` clones an existing
 repository-local credential helper that exchanges Samva authorization for a short-lived,
 repository-scoped credential; the token is never stored in the remote URL or Git config. Normal
 `git fetch`, `git pull`, `git add`, `git commit`, and `git push` remain the synchronization commands.
+A pushed commit is picked up on the next hosted workspace open; independent draft edits rebase,
+and overlapping edits produce explicit conflicts.
 Install from the project's lockfile (`bun install --frozen-lockfile` or `npm ci`) before `samva templates check` or `samva templates build`, then
 publish a clean, pushed commit with `samva templates publish`. Publish checks that the selected
 commit is an ancestor of the fetched `origin/<default-branch>` and creates an immutable receipt; it

package/README.md

@@ -202,8 +202,11 @@ with relative asset URLs, plus `<fixture>.sms.txt` and `<fixture>.whatsapp.json`
 Like `check` and `build`, it treats the current directory as the project: its `theme.css` themes
 the export and `samva:brand` resolves live or from `.samva/brands`.
 
-`git fetch`, `git pull`, `git add`, `git commit`, and `git push` are ordinary Git operations. The
-CLI's `init` and `clone` commands configure the repository-local helper; `publish` does not push
+`git fetch`, `git pull`, `git add`, `git commit`, and `git push` are ordinary Git operations.
+The next hosted workspace open picks up a pushed commit, rebases independent draft edits, and
+records explicit conflicts for overlapping edits.
+
+The CLI's `init` and `clone` commands configure the repository-local helper; `publish` does not push
 for you. It accepts a clean commit that is reachable from the fetched `origin/<default-branch>`
 and publishes that exact commit. A clone records its project in `samva.projectId`; pass
 `--project-id` from a checkout that `samva templates init` or `clone` did not create.