session-collab-mcp 2.3.0 → 2.3.1

package/README.md

@@ -102,7 +102,7 @@ The MCP tools give you a stable collaboration workflow across providers:
 
 1. Start a session with `collab_session_start`
 2. Check files with `collab_claim(action="check")`
-3. Reserve files with `collab_claim(action="create")`; conflicting claims are blocked by default
+3. Reserve files with `collab_claim(action="create")`; smart mode claims safe files and queues blocked files for coordination
 4. Update visible progress with `collab_session_update`
 5. Save important context with `collab_memory_save`
 6. Release claims with `collab_claim(action="release")`
@@ -133,9 +133,16 @@ Configure behavior with `collab_config`:
 
 | Mode | Behavior |
 |------|----------|
-| `strict` | Always ask user, never bypass |
-| `smart` (default) | Auto-proceed with safe content, ask for blocked |
-| `bypass` | Proceed despite conflicts (warn only) |
+| `strict` | Block conflicting claims and require user coordination before editing |
+| `smart` (default) | Claim non-conflicting files or symbols, queue blocked files, and expose coordination requests |
+| `bypass` | Allow overlapping claims only with `allow_conflicts=true`, and return a warning |
+
+In `smart` mode, prefer symbol-level claims when working inside a file that another session has claimed. Same-file work can proceed when claimed symbols do not overlap. If overlap cannot be proven safe, `collab_claim(action="create")` returns `waiting_for_coordination` or `partial_claim_created` with:
+
+- `claimed_files`: files reserved by the caller
+- `safe_files`: files that can be edited now
+- `blocked_files`: files that need coordination first
+- `coordination_requests`: queue entries visible through `collab_status` and `collab_session_list`
 
 ### Auto-Release Options
 
@@ -163,7 +170,7 @@ Configure behavior with `collab_config`:
 
 | Tool | Actions |
 |------|---------|
-| `collab_claim` | `create`, `check`, `release`, `list` (check: `exclude_self` defaults to true; create blocks conflicts unless `allow_conflicts=true`) |
+| `collab_claim` | `create`, `check`, `release`, `list` (check: `exclude_self` defaults to true; create follows `collab_config(mode)`) |
 
 ### Working Memory (3 tools)
 
@@ -228,9 +235,18 @@ collab_session_update(session_id="session-a", current_task="Adding JWT support")
 collab_claim(session_id="session-b", action="check", files=["src/auth.ts"])
 # Result: "CONFLICT: src/auth.ts is claimed by 'feature-auth'"
 
-# create is also safe by default; use allow_conflicts=true only after coordination
+# create in smart mode queues blocked files instead of editing over the owner
 collab_claim(session_id="session-b", action="create", files=["src/auth.ts"], intent="Coordinated auth work")
-# Result: "Claim not created. 1 conflict(s) detected."
+# Result: status="waiting_for_coordination", blocked_files=["src/auth.ts"]
+
+# If only a different symbol is needed, claim that symbol explicitly
+collab_claim(
+  session_id="session-b",
+  action="create",
+  symbols=[{ file="src/auth.ts", symbols=["refreshToken"], symbol_type="function" }],
+  intent="Update refresh token"
+)
+# Result: status="created" if no claimed symbol overlaps
 
 # If you want to include your own claims in the check
 collab_claim(session_id="session-a", action="check", files=["src/auth.ts"], exclude_self=false)
@@ -392,11 +408,11 @@ session-collab-mcp/
 
 ## Changelog
 
-### v2.3.0
+### v2.3.1
 
 - Add `collab_session_update` for heartbeat, current task, todo, and progress reporting
 - Enrich `collab_session_list` with current task and active claim summaries
-- Make `collab_claim(action="create")` block conflicts by default; use `allow_conflicts=true` only after coordination
+- Make `collab_claim(action="create")` respect `collab_config(mode)` with smart coordination by default
 - Add `session-collab doctor` for HTTP server health and tool-surface checks
 - Add `npm run test:http` and `npm run test:release` release gates
 - Update dev test tooling to clear npm audit findings