dev_context 1.2.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5acaef7b6cb13adb292bcdbc2f59bff0a659517d3b4d17f36f23b8afb11ee40d
-  data.tar.gz: c5d9cb92a6785bc719b810d66ea18badfd201c2c3fdf9ae438a5e4c41fca6994
+  metadata.gz: a909bb66276763e6e8cf92b56a703f63a7a81637977dd4e2c2ac6a2495ac6a0f
+  data.tar.gz: dbf0c96d8324235871af7ffda020f761287d66c980d7d34ae58082c7018ebffa
 SHA512:
-  metadata.gz: e3488671822dfdd73075c1f6c891ec961e62815807313b1fec8d229a70a3fd8867378b7c0089f4e697e3ed17e5fe3e2b0c19bdaea00d214c7df5817a3506f07a
-  data.tar.gz: aa423b93528d9f84023bf40707739cc730c73eecf0a0e0ef45277ca68834a301e25a03195d8a8cd9f7b0da0bd8eff55012b8eefc5730b4f35c90d9456e3a18a4
+  metadata.gz: d6169e888f0c0d6ec0ad01828ccbf24f1e961616f7ff01d044c63b9bef40cccc03b131a6b77ddae3ad05161c0a6a105545d555ceeec3659c1c3ec43bbcbdb903
+  data.tar.gz: 45842d4f6b81a31a2323683313bf11772318e62c45a2ef5fa9df4fa80809cc8e83dfe3f167b4bfe036ae8fe48a6bd7768d89284206698bdd2d767de703055558

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 ## [Unreleased]
 
+### Monorepo tooling (root-level)
+
+- Add `CLAUDE.md` with codebase guidance for Claude Code.
+- Add root `Gemfile` proxying to `implementations/ruby/` via `eval_gemfile` so `bundle install` works from repo root.
+- Add root `.rspec` and `spec/` symlinks so `bundle exec rspec` works from repo root without `cd`.
+- Add `ruby-bundle-ready` Makefile prerequisite so `test-ruby`, `install-ruby`, and `release-ruby` ensure Bundler state before running.
+
+## [2.0.1] - 2026-06-25
+
+- cleaned up erb and updated psych gems to avoid ARM crash on an older version of psych.
+
+## [2.0.0] - 2026-06-23
+
+### Added
+
+- Add `dx import` to ingest shell dirstack into `dx` active stack and resynchronize shell stack via eval script.
+- Add optional auto-reconcile gate via `DX_AUTO_IMPORT_SHELL_STACK=true` for stateful commands (`activate|cd`, `pushd`, `popd`).
+- Add shell wrapper transport of live dirstack via `DX_SHELL_STACK` for wrapped stack-aware commands.
+- Add end-to-end coverage in `bash` and `zsh` for mixed shell/dx dirstack mutations and reconciliation.
+
+### Changed
+
+- Strengthen `dx`/shell stack interoperability so manual shell `pushd`/`popd` changes can be reconciled by `dx import`.
+- Extend wrapped command handling in shell integration to include `import`.
+
+### Breaking Changes
+
+- Shell integration semantics now include dirstack payload transport (`DX_SHELL_STACK`) and `import` in wrapped eval paths.
+- Users relying on previous loose coupling between shell dirstack and `dx` active stack should treat this release as a behavior-boundary change.
+
+### Migration Notes
+
+- Run `dx init` and re-source `~/.dx.sh` after upgrading.
+- Use `dx import` to reconcile shell stack changes into `dx` state on demand.
+- Enable `DX_AUTO_IMPORT_SHELL_STACK=true` only if you want reconciliation to happen automatically before stateful `dx` commands.
+
 ## [1.1.0] - 2026-05-15
 
 - Add `dx doctor` diagnostics command with `dx check` alias.

data/README.md

@@ -14,7 +14,8 @@ A context is one `(repo_dir, branch)` pair. Context names can be explicit, or im
 Install the gem in the current ruby gem path, with executables installed as:
 
 - `~/bin/dev_context` (launcher, honors `DX_IMPL`)
-- `~/bin/dev_context-ruby` (Ruby implementation entrypoint)
+- `~/bin/dev_context-rb` (Ruby implementation entrypoint)
+- `~/bin/dev_context-ruby` (legacy Ruby implementation alias)
 
 To clone from the github repo:
 
@@ -41,17 +42,28 @@ To support `cd`, `dx` should be wrapped by a shell function that evaluates shell
 
 ```bash
 dx() {
+  local bin
+  case "${DX_IMPL:-go}" in
+    go)
+      bin=dev_context-go ;;
+    ruby)
+      bin=dev_context-rb ;;
+    elixir)
+      bin=dev_context-ex ;;
+    *)
+      echo 1>&2 "No idea what $DX_IMPL means!" ; exit 1 ;;
+  esac
   case "$1" in
     cd|activate|pushd|popd|pu|po)
       local out
-      out="$(DX_SHELL_WRAPPED=1 command dev_context "$@")" || return $?
+      out="$(DX_SHELL_WRAPPED=1 command $bin "$@")" || return $?
       case "$out" in
         "# DX_SHELL_EVAL"*) eval "$out" ;;
         *) printf "%s\n" "$out" ;;
       esac
       ;;
     *)
-      command dev_context "$@"
+      command $bin "$@"
       ;;
   esac
 }

data/bin/dev_context-rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../lib/dev_context"
+
+exit DevContext::CLI.run(ARGV)

data/lib/dev_context/cli.rb

@@ -64,6 +64,8 @@ module DevContext
         return cmd_help_topic(command)
       end
 
+      maybe_auto_import_shell_stack!(command)
+
       case command
       when "version"                 then cmd_version
       when "init"                    then cmd_init
@@ -76,6 +78,8 @@ module DevContext
       when "deactivate"              then cmd_deactivate
       when "doctor", "check"         then cmd_doctor
       when "find"                    then cmd_find
+      when "import"                  then cmd_import
+      when "stash"                   then cmd_stash
       when "stashes"                 then cmd_stashes
       when "repos"                   then cmd_repos
       when "status", "wip"           then cmd_status(mode: command)
@@ -97,9 +101,11 @@ module DevContext
     attr_reader :argv, :out, :err, :env, :pwd, :stdin, :config, :matcher
 
     COMMANDS = %w[
-      version init help add clone create remove active deactivate doctor check find repos stashes status wip diff branches br co checkout cd activate pushd popd
+      version init help add clone create remove active deactivate doctor check find repos stash stashes status wip diff branches br co checkout cd activate pushd popd import
     ].freeze
 
+    STATEFUL_COMMANDS = %w[activate cd pushd popd].freeze
+
     def default_action
       return cmd_init unless config.initialized?
 
@@ -110,5 +116,13 @@ module DevContext
       out.puts("dx #{DevContext::VERSION} (impl: ruby)")
       0
     end
+
+    def maybe_auto_import_shell_stack!(command)
+      return unless STATEFUL_COMMANDS.include?(command)
+      return unless truthy?(env.fetch("DX_AUTO_IMPORT_SHELL_STACK", "false"))
+      return unless shell_stack_imbalanced?
+
+      cmd_import(emit_script: false)
+    end
   end
 end

data/lib/dev_context/commands/context_lifecycle.rb

@@ -70,7 +70,8 @@ module DevContext
         script = ShellEmitter.new(
           context: context,
           remote_name: env.fetch("DX_GIT_REMOTE_NAME", "USE-REPO"),
-          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true"))
+          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true")),
+          stack_paths: config.active_contexts.map { |ctx| ctx.fetch("repo_path") }
         ).activation_script
         out.write(script)
         0

data/lib/dev_context/commands/doctor.rb

@@ -39,7 +39,6 @@ module DevContext
           content = File.read(shell_path)
           if content.include?(ShellSetup::MANAGED_MARKER)
             checks << ok_check("shell-script", "Found managed shell integration at #{shell_path}")
-            checks << ok_check("shell-managed", "Shell integration is managed by dx init")
             shell_version = extract_shell_script_version(content)
             if shell_version.nil?
               checks << warn_check("shell-version", "Managed shell integration is missing version marker")
@@ -93,6 +92,8 @@ module DevContext
         checks = []
         if missing.empty?
           checks << ok_check("repo-paths", "All known repo paths exist")
+        elsif fixture_mode?
+          checks << warn_check("repo-paths", "Fixture mode enabled; ignoring missing repo paths: #{missing.join(', ')}")
         else
           checks << fail_check("repo-paths", "Missing repo paths: #{missing.join(', ')}")
         end
@@ -162,6 +163,11 @@ module DevContext
       rescue StandardError
         false
       end
+
+      def fixture_mode?
+        value = env.fetch("DX_DOCTOR_FIXTURE_MODE", "")
+        %w[1 true yes on].include?(value.to_s.strip.downcase)
+      end
     end
   end
 end

data/lib/dev_context/commands/git_ops.rb

@@ -3,6 +3,17 @@
 module DevContext
   module Commands
     module GitOps
+      def cmd_import(emit_script: true)
+        imported_paths = parsed_shell_stack_paths
+        imported_contexts = import_contexts_for_paths(imported_paths)
+        config.active_stack.replace(imported_contexts.map { |ctx| ctx.fetch("name") })
+        config.send(:save!)
+        return 0 unless emit_script
+
+        out.write(stack_sync_script_for_active_contexts)
+        0
+      end
+
       def cmd_active
         active = config.active_contexts
         if active.empty?
@@ -46,7 +57,8 @@ module DevContext
         script = ShellEmitter.new(
           context: context,
           remote_name: env.fetch("DX_GIT_REMOTE_NAME", "USE-REPO"),
-          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true"))
+          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true")),
+          stack_paths: config.active_contexts.map { |ctx| ctx.fetch("repo_path") }
         ).activation_script
         out.write(script)
         0
@@ -65,7 +77,7 @@ module DevContext
           removed = config.deactivate_context!(context.fetch("name"))
           return not_found(target) unless removed
 
-          out.puts("Popped #{context.fetch('name')}")
+          print_pop_message("Popped #{context.fetch('name')}")
         else
           top_name = config.active_stack.first
           if top_name.nil?
@@ -75,13 +87,10 @@ module DevContext
 
           context = config.contexts.fetch(top_name)
           config.deactivate_context!(top_name)
-          out.puts("Popped #{context.fetch('name')}")
+          print_pop_message("Popped #{context.fetch('name')}")
         end
 
-        new_top = config.active_contexts.first
-        return 0 unless new_top
-
-        out.puts("cd #{Shellwords.escape(new_top.fetch('repo_path'))}")
+        out.write(stack_sync_script_for_active_contexts)
         0
       end
 
@@ -187,6 +196,56 @@ module DevContext
 
       private
 
+      def parsed_shell_stack_paths
+        seen = {}
+        env.fetch("DX_SHELL_STACK", "")
+          .lines
+          .map(&:strip)
+          .reject(&:empty?)
+          .map { |path| File.expand_path(path, pwd) }
+          .select { |path| git_repo?(path) }
+          .reject do |path|
+            already_seen = seen[path]
+            seen[path] = true
+            already_seen
+          end
+      end
+
+      def import_contexts_for_paths(paths)
+        paths.map do |repo_path|
+          branch = current_branch(repo_path) || "main"
+          context = config.contexts.values.find { |ctx| ctx["repo_path"] == repo_path && ctx["branch"] == branch } ||
+                    config.contexts.values.find { |ctx| ctx["repo_path"] == repo_path }
+          unless context
+            name = implicit_context_name(repo_path, branch)
+            context_name = ensure_unique_import_context_name(name, repo_path, branch)
+            config.add_context(name: context_name, repo_path: repo_path, branch: branch)
+            context = config.get_context(context_name)
+          end
+          context
+        end.compact
+      end
+
+      def ensure_unique_import_context_name(base_name, repo_path, branch)
+        existing = config.contexts[base_name]
+        return base_name unless existing
+        return base_name if existing["repo_path"] == repo_path && existing["branch"] == branch
+
+        suffix = 2
+        loop do
+          candidate = "#{base_name}-#{suffix}"
+          match = config.contexts[candidate]
+          return candidate unless match
+          return candidate if match["repo_path"] == repo_path && match["branch"] == branch
+
+          suffix += 1
+        end
+      end
+
+      def shell_stack_imbalanced?
+        parsed_shell_stack_paths != config.active_contexts.map { |ctx| File.expand_path(ctx.fetch("repo_path")) }
+      end
+
       def rotate_active_stack_to(token)
         stack = config.active_stack
         return no_active_contexts if stack.empty?
@@ -204,11 +263,13 @@ module DevContext
           return 1
         end
 
-        config.activate_context!(context_name)
+        config.active_stack.replace(stack.rotate(idx))
+        config.send(:save!)
         script = ShellEmitter.new(
           context: context,
           remote_name: env.fetch("DX_GIT_REMOTE_NAME", "USE-REPO"),
-          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true"))
+          auto_create_local_branch: truthy?(env.fetch("DX_AUTO_CREATE_LOCAL_BRANCH", "true")),
+          stack_paths: config.active_contexts.map { |ctx| ctx.fetch("repo_path") }
         ).activation_script
         out.write(script)
         0
@@ -227,12 +288,8 @@ module DevContext
         context_name = stack.delete_at(idx)
         context = config.contexts[context_name]
         config.send(:save!)
-        out.puts("Popped #{context ? context.fetch('name') : context_name}")
-
-        new_top = config.active_contexts.first
-        return 0 unless new_top
-
-        out.puts("cd #{Shellwords.escape(new_top.fetch('repo_path'))}")
+        print_pop_message("Popped #{context ? context.fetch('name') : context_name}")
+        out.write(stack_sync_script_for_active_contexts)
         0
       end
 
@@ -250,6 +307,28 @@ module DevContext
         out.puts("No active contexts")
         0
       end
+
+      def stack_sync_script_for_active_contexts
+        paths = config.active_contexts.map { |ctx| File.expand_path(ctx.fetch("repo_path")) }
+        script = +"#{ShellEmitter::SCRIPT_MARKER}\n"
+        script << "dirs -c >/dev/null 2>&1 || true\n"
+        return script if paths.empty?
+
+        script << "cd #{Shellwords.escape(paths.first)}\n"
+        paths.drop(1).each do |path|
+          script << "pushd #{Shellwords.escape(path)} >/dev/null 2>&1\n"
+          script << "pushd +1 >/dev/null 2>&1\n"
+        end
+        script
+      end
+
+      def print_pop_message(message)
+        if env["DX_SHELL_WRAPPED"] == "1"
+          err.puts(message)
+        else
+          out.puts(message)
+        end
+      end
     end
   end
 end

data/lib/dev_context/commands/help.rb

@@ -33,11 +33,13 @@ module DevContext
             dx <pattern>  # shorthand for: dx find <pattern>
             dx help
             dx init [ruby|go|elixir]
+            dx import
             dx version
             dx popd [CONTEXT|+N|-N]
             dx pushd [CONTEXT|PATH|URL|+N|-N]
             dx repos [PATTERN]
             dx remove CONTEXT|PATH
+            dx stash [--list] [--all|-a] [PATTERN]
             dx stashes [--list] [PATTERN]
             dx status|wip
         HELP
@@ -50,6 +52,8 @@ module DevContext
                  "Usage: dx status [--all] [--dirty] [-b BRANCHPATTERN] [-p PATHPATTERN]\n       dx wip [--all] [--dirty] [-b BRANCHPATTERN] [-p PATHPATTERN]\n\nShow branch and git status for active contexts. Use --all for all known repos, --dirty to filter non-clean repos, and -b/-p to filter by branch/path."
                when "repos"
                  "Usage: dx repos [-b BRANCHPATTERN] [-p PATHPATTERN] [PATTERN]\n\nList all known repos without git status details. PATTERN is shorthand for path filtering."
+               when "stash"
+                 "Usage: dx stash [--list] [--all|-a] [PATTERN]\n\nShow stashes for the active top context by default. Use --all/-a to scan all known repos. Provide PATTERN to filter stash titles; use --list to print matching entries."
                when "stashes"
                  "Usage: dx stashes [--list] [PATTERN]\n\nShow repos with stashes. Provide PATTERN to filter stash titles; use --list to print matching entries."
                when "find"
@@ -72,6 +76,8 @@ module DevContext
                  "Usage: dx pushd [CONTEXT|PATH|URL|+N|-N]\n\nCONTEXT accepts exact or fuzzy-matched context names. PATH and URL resolve/create contexts. +N/-N select existing active-stack entries (+0 top/left, -0 bottom/right) and rotate that entry to top."
                when "popd"
                  "Usage: dx popd [CONTEXT|+N|-N]\n\nWith no args, same as `dx popd +0`. CONTEXT accepts exact or fuzzy-matched context names. +N counts from top/left (+0 top), -N from bottom/right (-0 bottom)."
+               when "import"
+                 "Usage: dx import\n\nImport shell dirstack into dx active_stack (deduped by absolute path) and emit shell sync script."
                when "remove"
                  "Usage: dx remove CONTEXT|PATH"
                when "diff"

data/lib/dev_context/commands/stashes.rb

@@ -3,6 +3,41 @@
 module DevContext
   module Commands
     module Stashes
+      def cmd_stash
+        args = argv.dup
+        show_list = false
+        all = false
+        parser = OptionParser.new
+        parser.on("-l", "--list", "Show stash entry titles per repo") { show_list = true }
+        parser.on("-a", "--all", "Show stashes across all known repos") { all = true }
+        parser.parse!(args)
+        pattern = args.shift
+        return usage_error("dx stash [--list] [--all|-a] [PATTERN]") unless args.empty?
+
+        rows = if all
+                 known_repo_stash_rows(pattern: pattern)
+               else
+                 active_top_stash_rows(pattern: pattern)
+               end
+        if rows.empty?
+          out.puts("No repos with stashes")
+          return 0
+        end
+
+        render_stash_table(rows)
+        return 0 unless show_list
+
+        out.puts
+        rows.each do |row|
+          out.puts("#{display_path(row[:path])}:")
+          row[:entries].each { |entry| out.puts("  - #{entry}") }
+        end
+        0
+      rescue OptionParser::InvalidOption => e
+        err.puts("dx: #{e.message}")
+        usage_error("dx stash [--list] [--all|-a] [PATTERN]")
+      end
+
       def cmd_stashes
         args = argv.dup
         show_list = false
@@ -34,6 +69,26 @@ module DevContext
 
       private
 
+      def active_top_stash_rows(pattern: nil)
+        context = config.active_contexts.first
+        return [] unless context
+
+        path = context["repo_path"]
+        expanded = File.expand_path(path)
+        return [] unless File.directory?(expanded)
+
+        entries = stash_entries(expanded)
+        entries = entries.select { |entry| pattern_match?(entry, pattern) } if pattern
+        return [] if entries.empty?
+
+        [{
+          path: expanded,
+          branch: current_branch(expanded) || "-",
+          count: entries.length,
+          entries: entries
+        }]
+      end
+
       def render_stash_table(rows)
         display_rows = rows.map { |row| row.merge(path: display_path(row[:path])) }
         path_w = [display_rows.map { |r| r[:path].length }.max || 0, "Path".length].max

data/lib/dev_context/shell_emitter.rb

@@ -6,10 +6,11 @@ module DevContext
   class ShellEmitter
     SCRIPT_MARKER = "# DX_SHELL_EVAL".freeze
 
-    def initialize(context:, remote_name:, auto_create_local_branch:)
+    def initialize(context:, remote_name:, auto_create_local_branch:, stack_paths: nil)
       @context = context
       @remote_name = remote_name
       @auto_create_local_branch = auto_create_local_branch
+      @stack_paths = Array(stack_paths).map { |path| File.expand_path(path) }
     end
 
     def activation_script
@@ -51,11 +52,25 @@ module DevContext
           git remote get-url #{forced_remote} >/dev/null 2>&1 || __dx_fail "dx: remote '#{forced_remote}' does not exist in this repo" 19
           git pull --ff-only --autostash #{forced_remote} #{branch} || __dx_fail "dx: pull failed from #{forced_remote}/#{branch} (you are already in the target repo for investigation)" 20
         fi
+        #{stack_sync_script}
       SH
     end
 
     private
 
-    attr_reader :context, :remote_name, :auto_create_local_branch
+    attr_reader :context, :remote_name, :auto_create_local_branch, :stack_paths
+
+    def stack_sync_script
+      paths = stack_paths
+      return "dirs -c >/dev/null 2>&1 || true" if paths.empty?
+
+      lines = ["dirs -c >/dev/null 2>&1 || true", "cd #{Shellwords.escape(paths.first)} || __dx_fail \"dx: could not cd into #{Shellwords.escape(paths.first)}\" 21"]
+      paths.drop(1).each do |path|
+        escaped = Shellwords.escape(path)
+        lines << "pushd #{escaped} >/dev/null 2>&1 || __dx_fail \"dx: could not pushd #{escaped}\" 22"
+        lines << "pushd +1 >/dev/null 2>&1 || __dx_fail \"dx: could not rotate dirstack\" 23"
+      end
+      lines.join("\n")
+    end
   end
 end

data/lib/dev_context/shell_setup.rb

@@ -46,17 +46,16 @@ module DevContext
             go)
               bin=dev_context-go ;;
             ruby)
-              bin=dev_context.rb ;;
+            bin=dev_context-rb ;;
             elixir)
               bin=dev_context-ex ;;
             *)
               echo 1>&2 "No idea what $DX_IMPL means!" ; exit 1 ;;
           esac
-          local out
           case "$1" in
-            cd|activate|pushd|popd)
+            cd|activate|pushd|popd|pu|po|import)
               local out
-              out="$(DX_SHELL_WRAPPED=1 command $bin "$@")" || return $?
+              out="$(DX_SHELL_WRAPPED=1 DX_SHELL_STACK="$(dirs -p 2>/dev/null || pwd)" command $bin "$@")" || return $?
               case "$out" in
                 "# DX_SHELL_EVAL"*) eval "$out" ;;
                 *) printf "%s\\n" "$out" ;;

data/lib/dev_context/version.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 module DevContext
-  SHELL_VERSION = "1"
+  SHELL_VERSION = "2"
   RELEASES = [
-    ["1.0.1", '2026-05-12'],
+    ["2.0.1", '2026-06-25'],
+    ["2.0.0", '2026-06-23'],
+    ["1.2.0", '2026-05-28'],
     ["1.1.0", '2026-05-15'],
-    ["1.2.1", '2026-05-26']
+    ["1.0.1", '2026-05-12']
   ].freeze
-  VERSION = RELEASES.last.first
+  VERSION = RELEASES[0][0]
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dev_context
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Alan Stebbens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-26 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ email:
 - aks@stebbens.org
 executables:
 - dev_context
+- dev_context-rb
 - dev_context-ruby
 extensions: []
 extra_rdoc_files: []
@@ -71,6 +86,7 @@ files:
 - README.md
 - bin/console
 - bin/dev_context
+- bin/dev_context-rb
 - bin/dev_context-ruby
 - bin/setup
 - lib/dev_context.rb