threadnote 1.1.4 → 1.1.5

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/docs/share.md CHANGED
@@ -194,12 +194,15 @@ threadnote share sync --team friends # other team
194
194
  threadnote share sync --no-push # pull only
195
195
  ```
196
196
 
197
- `share sync` will auto-commit any uncommitted edits in the worktree, fetch and
198
- rebase from the remote, reindex pulled markdown files into OpenViking (so
199
- `recall` finds them immediately), and push. Pass `--no-auto-commit` to refuse
200
- syncing when the worktree is dirty. Automatic recall/read sync never commits a
201
- dirty shared worktree; it warns and leaves that case for explicit
202
- `threadnote share sync`.
197
+ `share sync` will auto-commit edits in Threadnote-managed share paths, fetch and
198
+ rebase onto the configured upstream, reindex pulled markdown files into
199
+ OpenViking (so `recall` finds them immediately), and push. Managed share paths
200
+ are root guidance/metadata files (`README.md`, `AGENTS.md`, `CLAUDE.md`,
201
+ `SKILL.md`, `.gitignore`) plus `durable/` and `agent-artifacts/`. If other dirty
202
+ files remain after staging those paths, sync stops before rebase so you can
203
+ commit, remove, or ignore them. Pass `--no-auto-commit` to refuse syncing when
204
+ the worktree is dirty. Automatic recall/read sync never commits a dirty shared
205
+ worktree; it warns and leaves that case for explicit `threadnote share sync`.
203
206
 
204
207
  ### Take a memory back
205
208
 
@@ -280,8 +283,8 @@ updates the git `origin` URL and verifies it with `git fetch`.
280
283
 
281
284
  ## Conflict resolution
282
285
 
283
- `share sync` uses `git pull --rebase` against the remote. When git can't merge
284
- cleanly:
286
+ `share sync` fetches the remote, then rebases onto the branch's configured
287
+ upstream. When git can't merge cleanly:
285
288
 
286
289
  1. The pull command reports the conflict and leaves the worktree in a
287
290
  rebase-in-progress state.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "threadnote",
3
- "version": "1.1.4",
3
+ "version": "1.1.5",
4
4
  "type": "commonjs",
5
5
  "main": "dist/threadnote.cjs",
6
6
  "description": "Shared local context and handoffs for development agents",