cc-sessions 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71cdec4c4feb8c680d3c29c2871393cd7af2255c3960f5a2b36eabc64fa9a7d
-  data.tar.gz: 03a816b0de6e0dd58017f816dc31e1c2b4acc7b77c159191dfa5f6e91faf6b6b
+  metadata.gz: 7c743c60e405530074e227bd6f4b02165cd78c217f0485898bf91505300db5eb
+  data.tar.gz: 5137132931a0bba947285cf71c36e64b978495ef6235128d56e6841702ca093b
 SHA512:
-  metadata.gz: d9fc6662868b728dff1a09b8ae9962f7efed1f32166048758366a2fb72dbda40de0a432b02817a4b2a3c7e854df3e089a272abbc1da288276cf8f85c4213376f
-  data.tar.gz: 84073e656ccf0dad4aa8fd7e01ffc6768d5863dd12cda83475ec4332dbb2cd10a7f736ff9481399abc77289480a866a23847f11721663d3e24fc7f4c8abf0a1f
+  metadata.gz: 1f1b848071bce7431e0f2de516e5ab314397be2a0df0c4447c744e4489032e9b509bc540bc5a69fdae170d2a619dfce8eeb9292f33aaf63cc6624e719afe2275
+  data.tar.gz: 771350b8e375aa0a6399dcce5f17f335b87d612e65d346eb5a5db1e19b65114e30f39be5edb3bdff1303d743e7dd04bcd2ebcf0fda1b7df5233c47d72ebcf7e8

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.4.0] - 2026-03-03
+
+### Fixed
+- Resuming a session that had a context continuation now auto-follows to the latest session ID instead of jumping back to the old one
+- Re-bookmarking (`/bm`) in a continued session now uses the detected (newest) session ID instead of the stale env var
+
+### Changed
+- `resume_session` detects newer `.jsonl` files and auto-migrates the bookmark before resuming
+- `cc-bookmark` prefers detected session ID over `CC_SESSION_ID` env var in bookmark mode
+- Old bookmarks and breadcrumbs cleaned up automatically during migration
+
+## [1.3.0] - 2026-02-27
+
+### Added
+- Running session indicator (green `●`) in `cc -l` interactive list
+- Resume breadcrumbs to track session continuations across context resets
+- `CC_SESSION_ID` and `CC_RESUME_TAGS` env vars passed to resumed sessions
+- `exclude_id` support in session detection for sibling session discovery
+
+### Changed
+- `cc-bookmark` now checks env vars first for reliable session identification
+- `/bm?` auto-migrates bookmark to new session ID after context reset
+
 ## [1.2.0] - 2026-02-19
 
 ### Added

data/README.md

@@ -18,6 +18,8 @@ meaningful names and quickly resume them.
 - **Check bookmark** with `/bm?` to see current tags
 - **Resume sessions** with `cc tag` from anywhere
 - **Interactive list** with `cc -l` (arrow keys or j/k to navigate)
+- **Running indicator** shows green `●` next to active sessions in `cc -l`
+- **Auto-follow continuations** — when Claude creates a new session (context reset), `cc` detects it and resumes the latest session automatically
 - **Delete bookmarks** with `d` in list or `cc -d tag`
 - **Auto-install** the `/bm` command and permission on first run
 - **Zero dependencies** - pure Ruby

data/bin/cc

@@ -17,6 +17,7 @@
 require 'json'
 require 'fileutils'
 require 'io/console'
+require 'set'
 
 # Simple ANSI helpers
 def cyan(s)  = "\e[36m#{s}\e[0m"
@@ -186,6 +187,20 @@ def delete_bookmark_by_tag(tag)
   end
 end
 
+def running_session_dirs
+  pids = `pgrep -x claude 2>/dev/null`.split.map(&:to_i)
+  dirs = 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))
+    rescue Errno::EACCES
+    end
+  end
+  dirs
+end
+
 def list_bookmarks
   bookmarks = load_bookmarks
 
@@ -196,8 +211,11 @@ def list_bookmarks
     return
   end
 
+  running = running_session_dirs
+
   items = bookmarks['sessions'].map do |id, entry|
-    { id: id, path: entry['path'], tags: entry['tags'], exists: Dir.exist?(entry['path']) }
+    { id: id, path: entry['path'], tags: entry['tags'], exists: Dir.exist?(entry['path']),
+      running: running.include?(entry['path']) }
   end
 
   index = 0
@@ -211,8 +229,14 @@ def list_bookmarks
         print clear_line
         tag_str = cyan(item[:tags].join(', '))
         path_str = dim(item[:path])
-        missing = item[:exists] ? '' : red(' [NOT FOUND]')
-        line = "#{tag_str} \u2192 #{path_str}#{missing}"
+        status = if !item[:exists]
+                   red(' [NOT FOUND]')
+                 elsif item[:running]
+                   green(' ●')
+                 else
+                   ''
+                 end
+        line = "#{tag_str} \u2192 #{path_str}#{status}"
 
         if i == index
           puts "\u25b8 #{line}"
@@ -366,11 +390,43 @@ def resume_session(session_id, path)
     exit 1
   end
 
+  bookmarks = load_bookmarks
+  entry = bookmarks['sessions'][session_id]
+
+  # Auto-migrate: if a newer session exists (context continuation), use it
+  unless session_id.start_with?('path:')
+    session_dir = resolve_session_dir(path)
+    newest_id = detect_session_id(session_dir)
+    if newest_id && newest_id != session_id && entry
+      puts dim("Session was continued — following to latest.")
+      bookmarks['sessions'].delete(session_id)
+      bookmarks['sessions'][newest_id] = entry
+      save_bookmarks(bookmarks)
+      # Clean up old breadcrumb if any
+      FileUtils.rm_f(File.join(CONFIG_DIR, 'resumed', "#{session_id}.json"))
+      session_id = newest_id
+    end
+  end
+
+  # Save resume breadcrumb so cc-bookmark can track session continuations
+  # (when context resets, Claude creates a new session ID)
+  if entry && !session_id.start_with?('path:')
+    resume_dir = File.join(CONFIG_DIR, 'resumed')
+    FileUtils.mkdir_p(resume_dir)
+    File.write(File.join(resume_dir, "#{session_id}.json"), entry['tags'].to_json)
+  end
+
   Dir.chdir(path) do
     # Emit OSC 7 so wezterm knows the new cwd (for Alt+n, etc.)
     host = `hostname`.strip
     print "\033]7;file://#{host}#{path}\007"
     puts "Resuming session in: #{path}"
+
+    # Export session info so cc-bookmark/hooks can reliably identify this session
+    ENV['CC_SESSION_ID'] = session_id
+    tags = entry ? entry['tags'].join(',') : ''
+    ENV['CC_RESUME_TAGS'] = tags unless tags.empty?
+
     if session_id.start_with?('path:')
       exec('claude', '-c')
     else

data/bin/cc-bookmark

@@ -10,6 +10,7 @@ require 'fileutils'
 CONFIG_DIR = File.expand_path('~/.cc-sessions')
 BOOKMARKS_FILE = File.join(CONFIG_DIR, 'bookmarks.json')
 CLAUDE_PROJECTS = File.expand_path('~/.claude/projects')
+RESUME_DIR = File.join(CONFIG_DIR, 'resumed')
 
 def resolve_session_dir(cwd)
   path = cwd
@@ -23,19 +24,52 @@ def resolve_session_dir(cwd)
   cwd
 end
 
-def detect_session_id(session_dir)
+def detect_session_id(session_dir, exclude_id: nil)
   encoded = session_dir.gsub('/', '-')
   project_dir = File.join(CLAUDE_PROJECTS, encoded)
   return nil unless Dir.exist?(project_dir)
 
-  newest = Dir.glob(File.join(project_dir, '*.jsonl'))
-               .select { |f| File.file?(f) }
-               .max_by { |f| File.mtime(f) }
+  candidates = Dir.glob(File.join(project_dir, '*.jsonl'))
+                   .select { |f| File.file?(f) }
+  candidates.reject! { |f| File.basename(f, '.jsonl') == exclude_id } if exclude_id
+
+  newest = candidates.max_by { |f| File.mtime(f) }
   return nil unless newest
 
   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
+
+# 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)
+
+  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
+rescue
+  nil
+end
+
 def load_bookmarks
   return { 'version' => 2, 'sessions' => {} } unless File.exist?(BOOKMARKS_FILE)
 
@@ -52,7 +86,6 @@ end
 def migrate_bookmarks(old_data)
   sessions = {}
   old_data.each do |path, tags|
-    # Try to find a real session ID for this path
     sid = detect_session_id(path)
     key = sid || "path:#{path}"
     sessions[key] = { 'path' => path, 'tags' => tags }
@@ -71,23 +104,82 @@ FileUtils.mkdir_p(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
 
 bookmarks = load_bookmarks
 cwd = resolve_session_dir(Dir.pwd)
-session_id = detect_session_id(cwd)
+original_id = ENV['CC_SESSION_ID']  # Set by `cc` wrapper — reliable
+session_id = detect_session_id(cwd) # Fallback — picks newest .jsonl
 tags = ARGV
 
 if tags.empty?
   # Query mode: show tags for current session
-  if session_id
+  # Priority: check the known original session ID first (from env var)
+  if original_id
+    entry = bookmarks['sessions'][original_id]
+    if entry
+      # Session ID hasn't changed, or bookmark is still on the original ID
+      puts "Current bookmark: #{entry['tags'].join(', ')}"
+    else
+      # Session ID changed (compaction/context reset).
+      # The bookmark is on the original ID but CC created a new session.
+      # Check if we have tags from env var or breadcrumb.
+      resume_tags = ENV['CC_RESUME_TAGS']&.split(',')
+      breadcrumb_file = File.join(RESUME_DIR, "#{original_id}.json")
+      if resume_tags.nil? && File.exist?(breadcrumb_file)
+        resume_tags = JSON.parse(File.read(breadcrumb_file)) rescue nil
+      end
+
+      if resume_tags
+        # Find the NEW session ID (newest .jsonl excluding the original)
+        new_id = detect_session_id(cwd, exclude_id: original_id)
+        if new_id
+          # Don't overwrite if the target session already has a bookmark
+          existing = bookmarks['sessions'][new_id]
+          if existing
+            puts "Current bookmark: #{existing['tags'].join(', ')}"
+          else
+            bookmarks['sessions'][new_id] = { 'path' => cwd, 'tags' => resume_tags }
+            save_bookmarks(bookmarks)
+            FileUtils.rm_f(breadcrumb_file)
+            puts "Current bookmark: #{resume_tags.join(', ')}"
+          end
+        else
+          puts "No bookmark for this session. Usage: /bm tag1 tag2 ..."
+        end
+      else
+        puts "No bookmark for this session. Usage: /bm tag1 tag2 ..."
+      end
+    end
+  elsif session_id
     entry = bookmarks['sessions'][session_id]
     if entry
       puts "Current bookmark: #{entry['tags'].join(', ')}"
     else
-      puts "No bookmark for this session. Usage: /bm tag1 tag2 ..."
+      # 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
     end
   else
     puts "Could not detect session ID. Usage: /bm tag1 tag2 ..."
   end
 else
-  key = session_id || "path:#{cwd}"
+  # 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}"
+
+  # Clean up old bookmark if session ID changed (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"))
+  end
+
   bookmarks['sessions'][key] = { 'path' => cwd, 'tags' => tags }
   save_bookmarks(bookmarks)
   puts "Bookmarked: #{cwd}"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: cc-sessions
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-19 00:00:00.000000000 Z
+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. UPDATE v1.2.0: Session ID-based bookmarks,
-  auto-migration, OSC 7 for wezterm CWD tracking.'
+  them with ''cc <tag>'' from anywhere. v1.4.0: Auto-follows context continuations
+  to latest session on resume.'
 email:
 - g@isene.com
 executables: