cc-sessions 1.4.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cad93912f48c81f33e5532c4a6015164d192899ba9e0bcaaa6a434270e99f881
-  data.tar.gz: b3600372722bcd711e490dacbb52e298cb45f1ffc7438c47bbae87dad0d17088
+  metadata.gz: 17f3d3abaf69a414fca43e117ab74e8c8ee7ae7160916eeac37f500ede7ba67f
+  data.tar.gz: 9090fe2bb7999335aef10e4d9058c741353e2066408f4db764429339e2ace16f
 SHA512:
-  metadata.gz: 3f575d1ae31c07665d31b1e31ae25f5bf509bc3a5c23f5598d44d9720d7e870cbc0e15ecb55a2c2ad34ac399bff45bf5bfb97688d02ba2cb5df10e0b79feb1f7
-  data.tar.gz: 8fb66ea0011e696e15161e7e3dbdf2a13b83dfcc4c3abba8ab8148d8d400d208c4bcfba4fce580aae05c4a0855ad3165290e98807fe1843fd802aa320f65f81e
+  metadata.gz: b245ba85c136be80547fcedc840f2e9a90dda0230c0da14f90221cef2471555e42d38b7783b9c872dd60579add274c8cfafe950c6d5de9ee2b3cf06b07b17e6d
+  data.tar.gz: 04717d6bde89c7419ceb3176c5998ab30b2a3efedba977cfc1834c15cf7c510e1f5c22d25e4ade820d6920d2089f84dc7c5f065995b82105d848563f3360a249

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # 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
+- Sessions no longer inherit bookmarks from unrelated sessions in the same directory
+- Removed path-based sibling matching in `find_resume_breadcrumb` — now only matches exact session IDs
+- Removed `find_tags_for_path` from `cc` — running session tags now resolved by session ID, not directory path
+- Running indicator (green dot) in `cc -l` now matches by session ID instead of path
+
+### Changed
+- `find_resume_breadcrumb` takes a session ID only, not a directory — eliminates cross-contamination
+- `cc -C` uses session-ID-based tag lookup instead of path matching
+
 ## [1.4.2] - 2026-03-03
 
 ### Fixed

data/bin/cc

@@ -139,11 +139,12 @@ def find_session_by_tag(tag)
   nil
 end
 
-def find_tags_for_path(path, bookmarks)
-  bookmarks['sessions'].each_value do |entry|
-    return entry['tags'] if entry['path'] == path
-  end
-  []
+def find_tags_for_session_dir(session_dir, bookmarks)
+  session_id = detect_session_id(session_dir)
+  return [] unless session_id
+
+  entry = bookmarks['sessions'][session_id]
+  entry ? entry['tags'] : []
 end
 
 def session_exists_in_dir?(dir)
@@ -187,18 +188,20 @@ def delete_bookmark_by_tag(tag)
   end
 end
 
-def running_session_dirs
+def running_session_ids
   pids = `pgrep -x claude 2>/dev/null`.split.map(&:to_i)
-  dirs = Set.new
+  ids = Set.new
   pids.each do |pid|
     cwd_link = "/proc/#{pid}/cwd"
     next unless File.exist?(cwd_link)
     begin
-      dirs << resolve_session_dir(File.readlink(cwd_link))
+      session_dir = resolve_session_dir(File.readlink(cwd_link))
+      sid = detect_session_id(session_dir)
+      ids << sid if sid
     rescue Errno::EACCES
     end
   end
-  dirs
+  ids
 end
 
 def list_bookmarks
@@ -211,11 +214,11 @@ def list_bookmarks
     return
   end
 
-  running = running_session_dirs
+  running = running_session_ids
 
   items = bookmarks['sessions'].map do |id, entry|
     { id: id, path: entry['path'], tags: entry['tags'], exists: Dir.exist?(entry['path']),
-      running: running.include?(entry['path']) }
+      running: running.include?(id) }
   end
 
   index = 0
@@ -337,7 +340,7 @@ def show_current_sessions
     begin
       cwd = File.readlink(cwd_link)
       session_dir = resolve_session_dir(cwd)
-      tags = find_tags_for_path(session_dir, bookmarks)
+      tags = find_tags_for_session_dir(session_dir, bookmarks)
       tag_str = tags.empty? ? dim('(no tags)') : green(tags.join(', '))
 
       puts "  PID #{cyan(pid.to_s)}: #{session_dir}"

data/bin/cc-bookmark

@@ -39,33 +39,23 @@ def detect_session_id(session_dir, exclude_id: nil)
   File.basename(newest, '.jsonl')
 end
 
-# Find all session IDs in the same project directory
-def sibling_session_ids(session_dir)
+# 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('/', '-')
-  project_dir = File.join(CLAUDE_PROJECTS, encoded)
-  return [] unless Dir.exist?(project_dir)
-
-  Dir.glob(File.join(project_dir, '*.jsonl'))
-     .select { |f| File.file?(f) }
-     .map { |f| File.basename(f, '.jsonl') }
+  File.exist?(File.join(CLAUDE_PROJECTS, encoded, "#{session_id}.jsonl"))
 end
 
-# Check resume breadcrumbs left by `cc` to find tags for a continued session.
-# When `cc <tag>` resumes a session that later gets a new ID (context reset),
-# the breadcrumb links the old session ID to its tags.
-def find_resume_breadcrumb(session_dir, current_id, bookmarks)
-  return nil unless Dir.exist?(RESUME_DIR)
+# 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)
+  return nil unless session_id && Dir.exist?(RESUME_DIR)
 
-  siblings = sibling_session_ids(session_dir)
-  siblings.each do |sid|
-    next if sid == current_id
-    breadcrumb = File.join(RESUME_DIR, "#{sid}.json")
-    next unless File.exist?(breadcrumb)
+  breadcrumb = File.join(RESUME_DIR, "#{session_id}.json")
+  return nil unless File.exist?(breadcrumb)
 
-    tags = JSON.parse(File.read(breadcrumb))
-    return [sid, tags] if tags.is_a?(Array)
-  end
-  nil
+  tags = JSON.parse(File.read(breadcrumb))
+  tags.is_a?(Array) ? tags : nil
 rescue
   nil
 end
@@ -116,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)
@@ -169,29 +167,25 @@ if tags.empty?
     if entry
       puts "Current bookmark: #{entry['tags'].join(', ')}"
     else
-      # Fallback: check resume breadcrumbs (legacy behavior, no env var)
-      match = find_resume_breadcrumb(cwd, session_id, bookmarks)
-      if match
-        old_id, old_tags = match
-        bookmarks['sessions'].delete(old_id)
-        bookmarks['sessions'][session_id] = { 'path' => cwd, 'tags' => old_tags }
-        save_bookmarks(bookmarks)
-        FileUtils.rm_f(File.join(RESUME_DIR, "#{old_id}.json"))
-        puts "Current bookmark: #{old_tags.join(', ')}"
-      else
-        puts "No bookmark for this session. Usage: /bm tag1 tag2 ..."
-      end
+      puts "No bookmark for this session. Usage: /bm tag1 tag2 ..."
     end
   else
     puts "Could not detect session ID. Usage: /bm tag1 tag2 ..."
   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.4.2
+  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.4.2: Fix cwd drift in session detection
-  on context continuations via hook.'
+  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: