cc-sessions 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302db7d00c9681e2823893988f22267090d6d5f4fdce2d32a64ace1fca5aac52
-  data.tar.gz: 12fefe5a2c340b8c3cd6bb8b599a81131fa353e01b7716a7b74b5f8dabe95394
+  metadata.gz: e5d11bb510817b94f744a4fcbcf84377f11e0eb3dbacc62de24a12b070440ab3
+  data.tar.gz: f39fcd03d01726cf2aed5373f1d8172a1775d7ad44f8e4945b86d2ee918c690a
 SHA512:
-  metadata.gz: 8898826c0e19218be5b433168ba3c436331d85b8452eb7d8eb29df33355d823d33628e2047a24eea26b444862eb47e6f8dfc41ca4d4e42a1f6c630d0dc891568
-  data.tar.gz: 6b8fe25b31450efecac302897df36624968d035c07d429e2d5f6174747847f515355c26c81faecf673a0e7b7b816ab5e9be045caddb04c0910f6c4c85ff49cfb
+  metadata.gz: b107bb851e4a8cdb041a85da1fe94fe22327e52ff5d8cb2a149a36c07414f550f2f7c2f59e1ee5757cd6b63365926b90713482f5e030e220e39c2874a9335298
+  data.tar.gz: '05790790d708513d61beabd74d8b372d6974dc66057418b48525ef4be979a3e6c883b3cd59209c75567727355304df2ca805512789f7da0a164f3a9e37d96c49'

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [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
+- `cc-bookmark` now uses the bookmark's stored path (not bash cwd) for session detection when `CC_SESSION_ID` is set — prevents migration to wrong project when cwd drifts during a session
+
 ## [1.4.1] - 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,16 @@ 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)
-  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') }
-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)
+  return nil unless session_id && Dir.exist?(RESUME_DIR)
 
-# 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)
+  breadcrumb = File.join(RESUME_DIR, "#{session_id}.json")
+  return nil unless File.exist?(breadcrumb)
 
-  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)
-
-    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
@@ -103,8 +86,16 @@ end
 FileUtils.mkdir_p(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
 
 bookmarks = load_bookmarks
-cwd = resolve_session_dir(Dir.pwd)
 original_id = ENV['CC_SESSION_ID']  # Set by `cc` wrapper — reliable
+
+# Use the bookmark's stored path (not Dir.pwd) when CC_SESSION_ID is set,
+# because bash cwd can drift to other directories during the session.
+if original_id
+  orig_entry = bookmarks['sessions'][original_id]
+  cwd = resolve_session_dir(orig_entry['path']) if orig_entry
+end
+cwd ||= resolve_session_dir(Dir.pwd)
+
 session_id = detect_session_id(cwd) # Fallback — picks newest .jsonl
 tags = ARGV
 
@@ -161,18 +152,7 @@ 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 ..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cc-sessions
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Geir Isene
@@ -12,8 +12,8 @@ date: 2026-03-03 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.1: Proactive bookmark migration on context
-  continuations via hook.'
+  them with ''cc <tag>'' from anywhere. v1.5.0: Strict session-ID matching — no more
+  path-based bookmark cross-contamination.'
 email:
 - g@isene.com
 executables: