cc-sessions 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d11bb510817b94f744a4fcbcf84377f11e0eb3dbacc62de24a12b070440ab3
-  data.tar.gz: f39fcd03d01726cf2aed5373f1d8172a1775d7ad44f8e4945b86d2ee918c690a
+  metadata.gz: 17f3d3abaf69a414fca43e117ab74e8c8ee7ae7160916eeac37f500ede7ba67f
+  data.tar.gz: 9090fe2bb7999335aef10e4d9058c741353e2066408f4db764429339e2ace16f
 SHA512:
-  metadata.gz: b107bb851e4a8cdb041a85da1fe94fe22327e52ff5d8cb2a149a36c07414f550f2f7c2f59e1ee5757cd6b63365926b90713482f5e030e220e39c2874a9335298
-  data.tar.gz: '05790790d708513d61beabd74d8b372d6974dc66057418b48525ef4be979a3e6c883b3cd59209c75567727355304df2ca805512789f7da0a164f3a9e37d96c49'
+  metadata.gz: b245ba85c136be80547fcedc840f2e9a90dda0230c0da14f90221cef2471555e42d38b7783b9c872dd60579add274c8cfafe950c6d5de9ee2b3cf06b07b17e6d
+  data.tar.gz: 04717d6bde89c7419ceb3176c5998ab30b2a3efedba977cfc1834c15cf7c510e1f5c22d25e4ade820d6920d2089f84dc7c5f065995b82105d848563f3360a249

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.5.1] - 2026-03-04
+
+### Fixed
+- Multiple sessions sharing a project dir no longer steal each other's bookmarks
+- `detect_session_id` (newest `.jsonl`) no longer overrides `CC_SESSION_ID` when the original session file exists
+- Query mode migration only triggers on true context continuation (original `.jsonl` gone), not when another session is simply newer
+- Reserved words ("query", "?", "status", "show") now trigger query mode instead of being saved as tag names
+
+### Added
+- `session_file_exists?` helper to distinguish "context continuation" from "another active session"
+
 ## [1.5.0] - 2026-03-03
 
 ### Fixed

data/bin/cc-bookmark

@@ -39,6 +39,13 @@ def detect_session_id(session_dir, exclude_id: nil)
   File.basename(newest, '.jsonl')
 end
 
+# Check if a session's .jsonl file still exists in the project dir
+def session_file_exists?(session_id, session_dir)
+  return false unless session_id
+  encoded = session_dir.gsub('/', '-')
+  File.exist?(File.join(CLAUDE_PROJECTS, encoded, "#{session_id}.jsonl"))
+end
+
 # Find resume breadcrumb for a specific session ID only.
 # Only matches exact session IDs — never scans siblings by path.
 def find_resume_breadcrumb(session_id)
@@ -99,15 +106,23 @@ cwd ||= resolve_session_dir(Dir.pwd)
 session_id = detect_session_id(cwd) # Fallback — picks newest .jsonl
 tags = ARGV
 
+# Treat reserved words as query mode, not tag names
+QUERY_WORDS = %w[? query status show].freeze
+if tags.length == 1 && QUERY_WORDS.include?(tags.first.downcase)
+  tags = []  # Convert to query mode
+end
+
 if tags.empty?
   # Query mode: show tags for current session
   # Priority: check the known original session ID first (from env var)
   if original_id
     entry = bookmarks['sessions'][original_id]
     if entry
-      # Check if session was continued (newer .jsonl exists)
-      if session_id && session_id != original_id
-        # Migrate bookmark to the new session ID
+      # Check if session was continued: original .jsonl is GONE and a newer one exists.
+      # If original .jsonl still exists, another session is just more recent — NOT a continuation.
+      original_gone = !session_file_exists?(original_id, cwd)
+      if original_gone && session_id && session_id != original_id
+        # True context continuation — migrate bookmark to the new session ID
         bookmarks['sessions'].delete(original_id)
         bookmarks['sessions'][session_id] = entry
         save_bookmarks(bookmarks)
@@ -159,11 +174,18 @@ if tags.empty?
   end
 else
   # Bookmark mode: set tags for current session
-  # Prefer detected (newest) session ID over env var — the env var may be stale
-  # after a context continuation where Claude created a new session ID
-  key = session_id || original_id || "path:#{cwd}"
+  # Use CC_SESSION_ID when its .jsonl still exists (it's the real session).
+  # Only fall back to detect_session_id when the original is gone (context continuation).
+  if original_id && session_file_exists?(original_id, cwd)
+    key = original_id
+  elsif original_id && session_id && session_id != original_id
+    # Context continuation — original .jsonl gone, use the new one
+    key = session_id
+  else
+    key = session_id || original_id || "path:#{cwd}"
+  end
 
-  # Clean up old bookmark if session ID changed (migration)
+  # Clean up old bookmark if session ID changed (true migration)
   if original_id && original_id != key && bookmarks['sessions'][original_id]
     bookmarks['sessions'].delete(original_id)
     FileUtils.rm_f(File.join(RESUME_DIR, "#{original_id}.json"))

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: cc-sessions
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-03 00:00:00.000000000 Z
+date: 2026-03-04 00:00:00.000000000 Z
 dependencies: []
 description: 'A simple tool for bookmarking and resuming Claude Code sessions. Tag
   sessions with meaningful names using /bm inside Claude Code, then quickly resume
-  them with ''cc <tag>'' from anywhere. v1.5.0: Strict session-ID matching — no more
-  path-based bookmark cross-contamination.'
+  them with ''cc <tag>'' from anywhere. v1.5.1: Fix multi-session bookmark isolation
+  — sessions sharing a project dir no longer steal each other''s bookmarks.'
 email:
 - g@isene.com
 executables: