markdown_exec 2.7.1 → 2.7.3

data/lib/hash_delegator.rb

@@ -91,6 +91,10 @@ module HashDelegatorSelf
     blocks.find { |item| item.send(msg) == value } || default
   end
 
+  def block_select(blocks, msg, value, default = nil)
+    blocks.select { |item| item.send(msg) == value }
+  end
+
   def code_merge(*bodies)
     merge_lists(*bodies)
   end
@@ -361,10 +365,10 @@ module HashDelegatorSelf
   # @param [String] line The line to be processed.
   # @param [Array<Symbol>] selected_types A list of message types to check.
   # @param [Proc] block The block to be called with the line data.
-  def yield_line_if_selected(line, selected_types, id: '', &block)
+  def yield_line_if_selected(line, selected_types, source_id: '', &block)
     return unless block && block_type_selected?(selected_types, :line)
 
-    block.call(:line, MarkdownExec::FCB.new(body: [line], id: id))
+    block.call(:line, MarkdownExec::FCB.new(body: [line], id: source_id))
   end
 end
 
@@ -600,52 +604,72 @@ module MarkdownExec
       end
     end
 
-    def add_back_option(id: '', menu_blocks:)
-      append_chrome_block(id: id, menu_blocks: menu_blocks,
-                          menu_state: MenuState::BACK)
+    def add_back_option(menu_blocks:, source_id: '')
+      append_chrome_block(
+        menu_blocks: menu_blocks,
+        menu_state: MenuState::BACK,
+        source_id: source_id
+      )
     end
 
-    def add_exit_option(id: '', menu_blocks:)
-      append_chrome_block(id: id, menu_blocks: menu_blocks,
-                          menu_state: MenuState::EXIT)
+    def add_exit_option(menu_blocks:, source_id: '')
+      append_chrome_block(
+        menu_blocks: menu_blocks,
+        menu_state: MenuState::EXIT,
+        source_id: source_id
+      )
     end
 
-    def add_inherited_lines(menu_blocks:, link_state:)
-      append_inherited_lines(menu_blocks: menu_blocks, link_state: link_state)
+    def add_inherited_lines(link_state:, menu_blocks:)
+      append_inherited_lines(
+        link_state: link_state,
+        menu_blocks: menu_blocks
+      )
     end
 
     # Modifies the provided menu blocks array by adding 'Back' and 'Exit' options,
     # along with initial and final dividers, based on the delegate object's configuration.
     #
     # @param menu_blocks [Array] The array of menu block elements to be modified.
-    def add_menu_chrome_blocks!(id: '', menu_blocks:, link_state:)
+    def add_menu_chrome_blocks!(link_state:, menu_blocks:, source_id: '')
       return unless @delegate_object[:menu_link_format].present?
 
-      if @delegate_object[:menu_with_inherited_lines]
-        add_inherited_lines(menu_blocks: menu_blocks,
-                            link_state: link_state)
-      end
+      add_inherited_lines(
+        link_state: link_state,
+        menu_blocks: menu_blocks
+      ) if @delegate_object[:menu_with_inherited_lines]
 
       # back before exit
-      add_back_option(id: "#{id}.back",
-                      menu_blocks: menu_blocks) if should_add_back_option?
+      add_back_option(
+        menu_blocks: menu_blocks,
+        source_id: "#{source_id}.back"
+      ) if should_add_back_option?
 
       # exit after other options
-      if @delegate_object[:menu_with_exit]
-        add_exit_option(id: "#{id}.exit", menu_blocks: menu_blocks)
-      end
 
-      append_divider(id: "#{id}.init", menu_blocks: menu_blocks,
-                     position: :initial)
-      append_divider(id: "#{id}.final", menu_blocks: menu_blocks,
-                     position: :final)
+      add_exit_option(
+        menu_blocks: menu_blocks,
+        source_id: "#{source_id}.exit"
+      ) if @delegate_object[:menu_with_exit]
+
+      append_divider(
+        menu_blocks: menu_blocks,
+        position: :initial,
+        source_id: "#{source_id}.init"
+      )
+
+      append_divider(
+        menu_blocks: menu_blocks,
+        position: :final,
+        source_id: "#{source_id}.final"
+      )
     end
 
     # Appends a chrome block, which is a menu option for Back or Exit
     #
     # @param all_blocks [Array] The current blocks in the menu
     # @param type [Symbol] The type of chrome block to add (:back or :exit)
-    def append_chrome_block(menu_blocks:, menu_state:, id: '')
+    def append_chrome_block(menu_blocks:, menu_state:, source_id: '')
       case menu_state
       when MenuState::BACK
         history_state_partition
@@ -683,7 +707,7 @@ module MarkdownExec
         dname: HashDelegator.new(@delegate_object).string_send_color(
           formatted_name, :menu_chrome_color
         ),
-        id: id,
+        id: source_id.to_s,
         type: BlockType::CHROME,
         nickname: formatted_name,
         oname: formatted_name
@@ -703,10 +727,10 @@ module MarkdownExec
     #
     # @param menu_blocks [Array] The array of menu block elements.
     # @param position [Symbol] The position to insert the divider (:initial or :final).
-    def append_divider(id: '', menu_blocks:, position:)
+    def append_divider(menu_blocks:, position:, source_id: '')
       return unless divider_formatting_present?(position)
 
-      divider = create_divider(position, id: id)
+      divider = create_divider(position, source_id: source_id)
       position == :initial ? menu_blocks.unshift(divider) : menu_blocks.push(divider)
     end
 
@@ -715,7 +739,7 @@ module MarkdownExec
     #
     # @param menu_blocks [Array] The array of menu block elements.
     # @param position [Symbol] The position to insert the divider (:initial or :final).
-    def append_inherited_lines(menu_blocks:, link_state:, position: top)
+    def append_inherited_lines(link_state:, menu_blocks:, position: top)
       return unless link_state.inherited_lines_present?
 
       insert_at_top = @delegate_object[:menu_inherited_lines_at_top]
@@ -783,13 +807,31 @@ module MarkdownExec
 
     # private
 
+    def expand_references!(fcb, link_state)
+      expand_variable_references!(
+        blocks: [fcb],
+        initial_code_required: false,
+        link_state: link_state
+      )
+      expand_variable_references!(
+        blocks: [fcb],
+        echo_format: '%s',
+        group_name: :command,
+        initial_code_required: false,
+        key_format: '$(%s)',
+        link_state: link_state,
+        pattern: options_command_substitution_regexp
+      )
+    end
+
     # Iterates through nested files to collect various types
     #  of blocks, including dividers, tasks, and others.
     # The method categorizes blocks based on their type and processes them accordingly.
     #
     # @return [Array<FCB>] An array of FCB objects representing the blocks.
     def blocks_from_nested_files(
-      link_state: @dml_link_state || LinkState.new
+      link_state: @dml_link_state || LinkState.new,
+      source_id: nil
     )
       register_console_attributes(@delegate_object)
       @decor_patterns_from_delegate_object_for_block_create = collect_line_decor_patterns(@delegate_object)
@@ -799,22 +841,6 @@ module MarkdownExec
       iter_blocks_from_nested_files do |btype, fcb|
         count += 1
 
-        # text substitution in menu
-        #
-        expand_references = lambda do |fcb|
-          expand_variable_references!(blocks: [fcb], link_state: link_state,
-                                      initial_code_required: false)
-          expand_variable_references!(
-            blocks: [fcb],
-            echo_format: '%s',
-            initial_code_required: false,
-            key_format: '$(%s)',
-            link_state: link_state,
-            group_name: :command,
-            pattern: options_command_substitution_regexp
-          )
-        end
-
         case btype
         when :blocks
           if @delegate_object[:bash]
@@ -822,20 +848,25 @@ module MarkdownExec
               block_calls_scan: @delegate_object[:block_calls_scan],
               block_name_match: @delegate_object[:block_name_match],
               block_name_nick_match: @delegate_object[:block_name_nick_match],
-              id: "*#{count}"
+              id: "#{source_id}_bfnf_b_#{count}"
             ) do |oname, color|
               apply_block_type_color_option(oname, color)
             end
+          else
+            expand_references!(fcb, link_state)
           end
-          expand_references.call(fcb)
           blocks << fcb
         when :filter # types accepted
           %i[blocks line]
         when :line
           unless @delegate_object[:no_chrome]
-            expand_references.call(fcb)
-            create_and_add_chrome_blocks(blocks, fcb, id: "*#{count}",
-                                                      init_ids: init_ids)
+            # expand references only if block is recognized (not a comment)
+            create_and_add_chrome_blocks(
+              blocks, fcb, id: "#{source_id}_bfnf_l_#{count}", init_ids: init_ids
+            ) do
+              # expand references only if block is recognized (not a comment)
+              expand_references!(fcb, link_state)
+            end
           end
         end
       end
@@ -952,16 +983,19 @@ module MarkdownExec
 
     # sets ENV
     def code_from_vars_block_to_set_environment_variables(selected)
-      code_lines = []
-      YAML.load(selected.body.join("\n"))&.each do |key, value|
-        ENV[key] = value.to_s
-        code_lines.push "#{key}=#{Shellwords.escape(value)}"
+      code_lines = []      
+      case data = YAML.load(selected.body.join("\n"))
+      when Hash
+        data.each do |key, value|
+          ENV[key] = value.to_s
+          code_lines.push "#{key}=#{Shellwords.escape(value)}"
 
-        next unless @delegate_object[:menu_vars_set_format].present?
+          next unless @delegate_object[:menu_vars_set_format].present?
 
-        formatted_string = format(@delegate_object[:menu_vars_set_format],
-                                  { key: key, value: value })
-        print string_send_color(formatted_string, :menu_vars_set_color)
+          formatted_string = format(@delegate_object[:menu_vars_set_format],
+                                    { key: key, value: value })
+          print string_send_color(formatted_string, :menu_vars_set_color)
+        end
       end
       code_lines
     end
@@ -1134,8 +1168,10 @@ module MarkdownExec
     end
 
     # Check if the expression contains wildcard characters
-    def contains_wildcards?(expr)
-      expr.match(%r{\*|\?|\[})
+    def contains_glob?(str)
+      return false if str.nil?
+
+      str.match?(/[\*\?\[\{\}]/)
     end
 
     def copy_to_clipboard(required_lines)
@@ -1200,13 +1236,15 @@ module MarkdownExec
       collapse: nil, color_method:, decor_patterns: [],
       disabled: true, format_option:, id: '',
       level: 0, match_data:, type: '',
-      wrap: nil
+      wrap: nil,
+      fcb: nil
     )
-      line_cap = NamedCaptureExtractor.extract_named_group2(match_data)
+      ww 'match_data', match_data
+      line_cap = NamedCaptureExtractor.extract_named_group_match_data(match_data)
       # replace tabs in indent
       line_cap[:indent] ||= ''
       line_cap[:indent] = line_cap[:indent].dup if line_cap[:indent].frozen?
-      line_cap[:indent].gsub!("\t", '    ')
+      line_cap[:indent].gsub!("\t", '    ') # TAB_SIZE = 4
       # replace tabs in text
       line_cap[:text] ||= ''
       line_cap[:text] = line_cap[:text].dup if line_cap[:text].frozen?
@@ -1234,6 +1272,7 @@ module MarkdownExec
         end
       end
 
+      use_fcb = !fcb.nil? # fcb only for the first record if any
       line_caps.each_with_index do |line_obj, index|
         next if line_obj[:text].nil?
 
@@ -1256,23 +1295,45 @@ module MarkdownExec
         )
 
         line_obj[:line] = line_obj[:indent] + line_obj[:text]
-        blocks.push FCB.new(
-          center: center,
-          chrome: true,
-          collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
-          token: line_obj[:collapse],
-          disabled: disabled ? TtyMenu::DISABLE : nil,
-          id: "#{id}.#{index}",
-          level: level,
-          s0indent: indent,
-          s0printable: line_obj[:text],
-          s1decorated: decorated,
-          dname: line_obj[:indent] + decorated,
-          indent: line_obj[:indent],
-          oname: line_obj[:text],
-          text: line_obj[:text],
-          type: type
-        )
+
+        if !use_fcb
+          fcb = FCB.new(
+            center: center,
+            chrome: true,
+            collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
+            token: line_obj[:collapse],
+            disabled: disabled ? TtyMenu::DISABLE : nil,
+            id: "#{id}.#{index}",
+            level: level,
+            s0indent: indent,
+            s0printable: line_obj[:text],
+            s1decorated: decorated,
+            dname: line_obj[:indent] + decorated,
+            indent: line_obj[:indent],
+            oname: line_obj[:text],
+            text: line_obj[:text],
+            type: type
+          )
+        else
+          fcb.center = center
+          fcb.chrome = true
+          fcb.collapse = collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse
+          fcb.token = line_obj[:collapse]
+          fcb.disabled = disabled ? TtyMenu::DISABLE : nil
+          fcb.id = "#{id}.#{index}"
+          fcb.level = level
+          fcb.s0indent = indent
+          fcb.s0printable = line_obj[:text]
+          fcb.s1decorated = decorated
+          fcb.dname = line_obj[:indent] + decorated
+          fcb.indent = line_obj[:indent]
+          fcb.oname = line_obj[:text]
+          fcb.text = line_obj[:text]
+          fcb.type = type
+          use_fcb = false # next line is new record
+        end
+
+        blocks.push fcb
       end
       line_caps.count
     end
@@ -1292,6 +1353,12 @@ module MarkdownExec
           next
         end
 
+        if block_given?
+          # expand references only if block is recognized (not a comment)
+          yield if block_given?
+          mbody = fcb.body[0].match @delegate_object[criteria[:match]]
+        end
+
         create_and_add_chrome_block(
           blocks: blocks,
           case_conversion: criteria[:case_conversion],
@@ -1312,6 +1379,7 @@ module MarkdownExec
           decor_patterns:
             @decor_patterns_from_delegate_object_for_block_create,
           disabled: !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
+          fcb: fcb,
           id: "#{id}.#{index}",
           format_option: criteria[:format] &&
                          @delegate_object[criteria[:format]],
@@ -1324,7 +1392,7 @@ module MarkdownExec
       end
     end
 
-    def create_divider(position, id: '')
+    def create_divider(position, source_id: '')
       divider_key = if position == :initial
                       :menu_initial_divider
                     else
@@ -1337,7 +1405,7 @@ module MarkdownExec
         chrome: true,
         disabled: TtyMenu::DISABLE,
         dname: string_send_color(oname, :menu_divider_color),
-        id: id,
+        id: source_id,
         oname: oname
       )
     end
@@ -1420,9 +1488,10 @@ module MarkdownExec
 
     def dml_menu_append_chrome_item(
       name, count, type,
-      id: '',
+      always_create: true,
+      always_enable: true,
       menu_state: MenuState::LOAD,
-      always_create: true, always_enable: true
+      source_id: ''
     )
       raise unless name.present?
       raise if @dml_menu_blocks.nil?
@@ -1432,7 +1501,7 @@ module MarkdownExec
       # create menu item when it is needed (count > 0)
       #
       if item.nil? && (always_create || count.positive?)
-        item = append_chrome_block(id: id,
+        item = append_chrome_block(source_id: source_id,
                                    menu_blocks: @dml_menu_blocks,
                                    menu_state: menu_state)
       end
@@ -1688,11 +1757,7 @@ module MarkdownExec
 
       elsif COLLAPSIBLE_TYPES.include?(selected.type)
         debounce_reset
-        if @compressed_ids.keys.include?(selected.id)
-          @compressed_ids.delete(selected.id)
-        else
-          @compressed_ids.merge!(selected.id => selected.level)
-        end
+        menu_toggle_collapsible_block(selected)
         LoadFileLinkState.new(LoadFile::REUSE, link_state)
 
       elsif debounce_allows
@@ -1880,18 +1945,28 @@ module MarkdownExec
       view: @delegate_object[:vars_block_filename_view]
     )
       block_data = HashDelegator.parse_yaml_data_from_body(selected.body)
-      if selected_option = select_option_with_metadata(
+
+      dirs = Dir.glob(
+        File.join(
+          Dir.pwd,
+          block_data['directory'] || directory,
+          block_data['glob'] || glob
+        )
+      )
+
+      if !contains_glob?(block_data['directory']) &&
+         !contains_glob?(block_data['glob'])
+        if dirs[0]
+          File.readlines(dirs[0], chomp: true)
+        else
+          warn 'No matching file found.'
+        end
+      elsif selected_option = select_option_with_metadata(
         prompt_title,
-        [exit_prompt] + Dir.glob(
-          File.join(
-            Dir.pwd,
-            block_data['directory'] || directory,
-            block_data['glob'] || glob
-          )
-        ).sort.map do |file|
+        [exit_prompt] + dirs.sort.map do |file|
           { name: format(
             block_data['view'] || view,
-            NamedCaptureExtractor.extract_named_group2(
+            NamedCaptureExtractor.extract_named_group_match_data(
               file.match(
                 Regexp.new(block_data['filename_pattern'] ||
                            filename_pattern)
@@ -1908,7 +1983,7 @@ module MarkdownExec
           File.readlines(selected_option.oname, chomp: true)
         end
       else
-        warn 'No matching files found'
+        warn 'No matching files found.'
       end
     end
 
@@ -2397,7 +2472,7 @@ module MarkdownExec
          Regexp.new(@delegate_object.fetch(
                       :fenced_start_and_end_regex, '^(?<indent> *)`{3,}'
                     )),
-        fcb: MarkdownExec::FCB.new,
+        fcb: MarkdownExec::FCB.new(id: 'INIT'),
         in_fenced_block: false,
         headings: []
       }
@@ -2419,16 +2494,16 @@ module MarkdownExec
 
         update_line_and_block_state(
           nested_line, state, selected_types,
-          id: "#{@delegate_object[:filename]}:#{index}",
+          source_id: "#{@delegate_object[:filename]}_ibfnf_#{index}",
           &block
         )
       end
     end
 
-    def iter_source_blocks(source, &block)
+    def iter_source_blocks(source, source_id: nil, &block)
       case source
       when 1
-        blocks_from_nested_files.each(&block)
+        blocks_from_nested_files(source_id: source_id).each(&block)
       when 2
         @dml_blocks_in_file.each(&block)
       when 3
@@ -2487,20 +2562,29 @@ module MarkdownExec
       label_format_above = @delegate_object[:shell_code_label_format_above]
       label_format_below = @delegate_object[:shell_code_label_format_below]
 
-      [label_format_above.present? &&
-        format(label_format_above,
-               block_source.merge({ block_name: selected.pub_name }))] +
-        output_lines.map do |line|
-          re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
-          next unless re =~ line
-
-          re.gsub_format(line,
-                         link_block_data.fetch('format',
-                                               '%{line}'))
-        end.compact +
-        [label_format_below.present? &&
-         format(label_format_below,
-                block_source.merge({ block_name: selected.pub_name }))]
+      ([
+        label_format_above.present? ?
+          format(
+            label_format_above,
+            block_source.merge({ block_name: selected.pub_name })
+          ) : nil
+      ] +
+      output_lines.map do |line|
+        re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
+        next unless re =~ line
+
+        re.gsub_format(
+          line,
+          link_block_data.fetch('format', '%{line}')
+        )
+      end +
+      [
+        label_format_below.present? ?
+          format(
+            label_format_below,
+            block_source.merge({ block_name: selected.pub_name })
+          ) : nil
+      ]).compact
     end
 
     def link_history_push_and_next(
@@ -2548,12 +2632,14 @@ module MarkdownExec
       }
     end
 
-    def list_blocks
+    def list_blocks(source_id: nil)
       message = @delegate_object[:list_blocks_message]
       block_eval = @delegate_object[:list_blocks_eval]
 
       list = []
-      iter_source_blocks(@delegate_object[:list_blocks_type]) do |block|
+      iter_source_blocks(
+        @delegate_object[:list_blocks_type], source_id: source_id
+      ) do |block|
         list << (block_eval.present? ? eval(block_eval) : block.send(message))
       end
       list.compact!
@@ -2566,21 +2652,25 @@ module MarkdownExec
     # Executes a specified block once per filename.
     # @param all_blocks [Array] Array of all block elements.
     # @return [Boolean, nil] True if values were modified, nil otherwise.
-    def load_auto_opts_block(all_blocks, id: '', mdoc:)
+    def load_auto_opts_block(all_blocks, mdoc:)
       block_name = @delegate_object[:document_load_opts_block_name]
       unless block_name.present? &&
              @opts_most_recent_filename != @delegate_object[:filename]
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
-      options_state = read_show_options_and_trigger_reuse(
-        mdoc: mdoc,
-        selected: block
+      update_menu_base(
+        blocks.each.with_object({}) do |block, merged_options|
+          options_state = read_show_options_and_trigger_reuse(
+            mdoc: mdoc,
+            selected: block
+          )
+          merged_options.merge!(options_state.options)
+        end
       )
-      update_menu_base(options_state.options)
 
       @opts_most_recent_filename = @delegate_object[:filename]
       true
@@ -2593,11 +2683,16 @@ module MarkdownExec
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
       @vars_most_recent_filename = @delegate_object[:filename]
-      code_from_vars_block_to_set_environment_variables(block)
+
+      (blocks.each.with_object([]) do |block, merged_options|
+        merged_options.push(
+          code_from_vars_block_to_set_environment_variables(block)
+        )
+      end).to_a
     end
 
     def load_cli_or_user_selected_block(all_blocks: [], menu_blocks: [],
@@ -2620,6 +2715,30 @@ module MarkdownExec
       SelectedBlockMenuState.new(block, source, state)
     end
 
+    def load_document_shell_block(all_blocks, mdoc: nil)
+      block_name = @delegate_object[:document_load_shell_block_name]
+      unless block_name.present? &&
+             @shell_most_recent_filename != @delegate_object[:filename]
+        return
+      end
+
+      fcb = HashDelegator.block_find(all_blocks, :oname, block_name)
+      return unless fcb
+
+      @shell_most_recent_filename = @delegate_object[:filename]
+
+      if mdoc
+        mdoc.collect_recursively_required_code(
+          anyname: fcb.pub_name,
+          label_format_above: @delegate_object[:shell_code_label_format_above],
+          label_format_below: @delegate_object[:shell_code_label_format_below],
+          block_source: block_source
+        )[:code]
+      else
+        fcb.body
+      end
+    end
+
     # format + glob + select for file in load block
     # name has references to ENV vars and doc and batch vars
     #  incl. timestamp
@@ -2628,7 +2747,7 @@ module MarkdownExec
       expanded_expression = formatted_expression(expression)
 
       # Handle wildcards or direct file specification
-      if contains_wildcards?(expanded_expression)
+      if contains_glob?(expanded_expression)
         load_filespec_wildcard_expansion(expanded_expression)
       else
         expanded_expression
@@ -2676,8 +2795,8 @@ module MarkdownExec
       [block_name_from_cli, now_using_cli]
     end
 
-    def mdoc_and_blocks_from_nested_files
-      menu_blocks = blocks_from_nested_files
+    def mdoc_and_blocks_from_nested_files(source_id: nil)
+      menu_blocks = blocks_from_nested_files(source_id: source_id)
       mdoc = MDoc.new(menu_blocks) do |nopts|
         @delegate_object.merge!(nopts)
       end
@@ -2687,12 +2806,19 @@ module MarkdownExec
     ## Handles the file loading and returns the blocks
     #  in the file and MDoc instance
     #
-    def mdoc_menu_and_blocks_from_nested_files(link_state, id: '')
+    def mdoc_menu_and_blocks_from_nested_files(link_state, source_id: '')
       # read blocks, load document opts block, and re-process blocks
       #
-      all_blocks, mdoc = mdoc_and_blocks_from_nested_files
-      if load_auto_opts_block(all_blocks, id: id, mdoc: mdoc)
-        all_blocks, mdoc = mdoc_and_blocks_from_nested_files
+      all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
+      if load_auto_opts_block(all_blocks, mdoc: mdoc)
+        all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
+      end
+
+      # load document shell block
+      #
+      if code_lines = load_document_shell_block(all_blocks, mdoc: mdoc)
+        next_state_set_code(nil, link_state, code_lines)
+        link_state.inherited_lines = code_lines
       end
 
       # load document vars block
@@ -2700,11 +2826,7 @@ module MarkdownExec
       if code_lines = load_auto_vars_block(all_blocks)
         new_code = HashDelegator.code_merge(link_state.inherited_lines,
                                             code_lines)
-        next_state_set_code(
-          nil,
-          link_state,
-          new_code
-        )
+        next_state_set_code(nil, link_state, new_code)
         link_state.inherited_lines = new_code
       end
 
@@ -2714,10 +2836,22 @@ module MarkdownExec
         @delegate_object.merge!(compressed_ids: @compressed_ids)
       )
 
+      # re-expand blocks
+      menu_blocks.each do |fcb|
+        fcb.body = fcb.raw_body || fcb.body || []
+        fcb.dname = fcb.raw_dname || fcb.dname
+        fcb.s0printable = fcb.raw_s0printable || fcb.s0printable
+        fcb.s1decorated = fcb.raw_s1decorated || fcb.s1decorated
+        expand_references!(fcb, link_state)
+      end
+
       # chrome for menu
       #
-      add_menu_chrome_blocks!(id: id, menu_blocks: menu_blocks,
-                              link_state: link_state)
+      add_menu_chrome_blocks!(
+        link_state: link_state,
+        menu_blocks: menu_blocks,
+        source_id: source_id
+      )
 
       ### compress empty lines
       HashDelegator.delete_consecutive_blank_lines!(menu_blocks)
@@ -2743,6 +2877,7 @@ module MarkdownExec
         dname: HashDelegator.new(@delegate_object).string_send_color(
           document_glob, :menu_inherited_lines_color
         ),
+        # 2025-01-03 menu item is disabled ∴ does not need a recall id
         oname: formatted_name
       )
 
@@ -2783,6 +2918,22 @@ module MarkdownExec
       end
     end
 
+    def menu_compress_collapsible_block(selected)
+      @compressed_ids.merge!(selected.id => selected.level)
+    end
+
+    def menu_expand_collapsible_block(selected)
+      @compressed_ids.delete(selected.id)
+    end
+
+    def menu_toggle_collapsible_block(selected)
+      if @compressed_ids.keys.include?(selected.id)
+        menu_expand_collapsible_block(selected)
+      else
+        menu_compress_collapsible_block(selected)
+      end
+    end
+
     # If a method is missing, treat it as a key for the @delegate_object.
     def method_missing(method_name, *args, &block)
       if @delegate_object.respond_to?(method_name)
@@ -3435,7 +3586,7 @@ module MarkdownExec
       formatted = formatted_expression(expression)
 
       # Handle wildcards or direct file specification
-      if contains_wildcards?(formatted)
+      if contains_glob?(formatted)
         save_filespec_wildcard_expansion(formatted)
       else
         formatted
@@ -3579,11 +3730,14 @@ module MarkdownExec
           item == selection
         end
       end
+
+      # new FCB if selected is not an object
       if selected.instance_of?(String)
         selected = FCB.new(dname: selected)
       elsif selected.instance_of?(Hash)
         selected = FCB.new(selected)
       end
+
       unless selected
         HashDelegator.error_handler('select_option_with_metadata',
                                     error: 'menu item not found')
@@ -3651,7 +3805,9 @@ module MarkdownExec
     # @param fenced_start_extended_regex [Regexp]
     #  Regular expression to identify fenced block start.
     # @return [MarkdownExec::FCB] A new FCB instance with the parsed attributes.
-    def start_fenced_block(line, headings, fenced_start_extended_regex)
+    def start_fenced_block(
+      line, headings, fenced_start_extended_regex, source_id: nil
+    )
       fcb_title_groups = NamedCaptureExtractor.extract_named_groups(
         line, fenced_start_extended_regex
       )
@@ -3702,6 +3858,7 @@ module MarkdownExec
         disabled: disabled,
         dname: dname,
         headings: headings,
+        id: source_id.to_s,
         indent: fcb_title_groups.fetch(:indent, ''),
         nickname: nickname,
         oname: oname,
@@ -3709,10 +3866,10 @@ module MarkdownExec
         shell: fcb_title_groups.fetch(:shell, ''),
         start_line: line,
         stdin: if (tn = rest.match(/<(?<type>\$)?(?<name>[A-Za-z_-]\S+)/))
-                 NamedCaptureExtractor.extract_named_group2(tn)
+                 NamedCaptureExtractor.extract_named_group_match_data(tn)
                end,
         stdout: if (tn = rest.match(/>(?<type>\$)?(?<name>[\w.\-]+)/))
-                  NamedCaptureExtractor.extract_named_group2(tn)
+                  NamedCaptureExtractor.extract_named_group_match_data(tn)
                 end,
         title: title,
         type: fcb_title_groups.fetch(:type, ''),
@@ -3764,7 +3921,7 @@ module MarkdownExec
     ##
     def update_line_and_block_state(
       nested_line, state, selected_types,
-      id:,
+      source_id:,
       &block
     )
       line = nested_line.to_s
@@ -3784,7 +3941,8 @@ module MarkdownExec
           #
           state[:fcb] = start_fenced_block(
             line, state[:headings],
-            @delegate_object[:fenced_start_extended_regex]
+            @delegate_object[:fenced_start_extended_regex],
+            source_id: source_id
           )
           state[:fcb][:depth] = nested_line[:depth]
           state[:fcb][:indention] = nested_line[:indention]
@@ -3801,8 +3959,9 @@ module MarkdownExec
             @delegate_object[:menu_include_imported_notes]
         # add line if it is depth 0 or option allows it
         #
-        HashDelegator.yield_line_if_selected(line, selected_types, id: id,
-                                             &block)
+        HashDelegator.yield_line_if_selected(
+          line, selected_types, source_id: source_id, &block
+        )
       end
     end
 
@@ -4078,15 +4237,20 @@ module MarkdownExec
         end
       end
 
+      count = 0
       InputSequencer.new(
         @delegate_object[:filename],
         block_list
       ).run do |msg, data|
+        count += 1
         case msg
         when :parse_document # once for each menu
-          vux_parse_document(id: 'vux_parse_document')
-          vux_menu_append_history_files(formatted_choice_ostructs,
-                                        id: 'vux_menu_append_history_files')
+          count = 0
+          vux_parse_document(source_id: "#{@delegate_object[:filename]}_vmlpd")
+          vux_menu_append_history_files(
+            formatted_choice_ostructs,
+            source_id: "#{@delegate_object[:filename]}_vmlhf"
+          )
           vux_publish_document_file_name_for_external_automation
 
         when :display_menu
@@ -4097,7 +4261,7 @@ module MarkdownExec
           # yield :end_of_cli, @delegate_object
 
           if @delegate_object[:list_blocks]
-            list_blocks
+            list_blocks(source_id: "#{@delegate_object[:filename]}_vmleoc")
             :exit
           end
 
@@ -4132,8 +4296,9 @@ module MarkdownExec
       end
     end
 
-    def vux_menu_append_history_files(formatted_choice_ostructs,
-                                      id: '')
+    def vux_menu_append_history_files(
+      formatted_choice_ostructs, source_id: ''
+    )
       if @delegate_object[:menu_for_history]
         history_files(
           @dml_link_state,
@@ -4145,8 +4310,8 @@ module MarkdownExec
             dml_menu_append_chrome_item(
               formatted_choice_ostructs[:history].oname, files.count,
               'files',
-              id: id,
-              menu_state: MenuState::HISTORY
+              menu_state: MenuState::HISTORY,
+              source_id: source_id
             )
           end
         end
@@ -4168,38 +4333,38 @@ module MarkdownExec
       if files.count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:load].dname, files.count, 'files',
-          id: "#{id}.load",
-          menu_state: MenuState::LOAD
+          menu_state: MenuState::LOAD,
+          source_id: "#{source_id}_vmahf_load"
         )
       end
       if @delegate_object[:menu_inherited_lines_edit_always] ||
          lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:edit].dname, lines_count, 'lines',
-          id: "#{id}.edit",
-          menu_state: MenuState::EDIT
+          menu_state: MenuState::EDIT,
+          source_id: "#{source_id}_vmahf_edit"
         )
       end
       if lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:save].dname, 1, '',
-          id: "#{id}.save",
-          menu_state: MenuState::SAVE
+          menu_state: MenuState::SAVE,
+          source_id: "#{source_id}_vmahf_save"
         )
       end
       if lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:view].dname, 1, '',
-          id: "#{id}.view",
-          menu_state: MenuState::VIEW
+          menu_state: MenuState::VIEW,
+          source_id: "#{source_id}_vmahf_view"
         )
       end
       # rubocop:disable Style/GuardClause
       if @delegate_object[:menu_with_shell]
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:shell].dname, 1, '',
-          id: "#{id}.shell",
-          menu_state: MenuState::SHELL
+          menu_state: MenuState::SHELL,
+          source_id: "#{source_id}_vmahf_shell"
         )
       end
       # rubocop:enable Style/GuardClause
@@ -4217,7 +4382,7 @@ module MarkdownExec
       )
     end
 
-    def vux_parse_document(id: '')
+    def vux_parse_document(source_id: '')
       @run_state.batch_index += 1
       @run_state.in_own_window = false
 
@@ -4239,7 +4404,9 @@ module MarkdownExec
       # update @delegate_object and @menu_base_options in auto_load
       #
       @dml_blocks_in_file, @dml_menu_blocks, @dml_mdoc =
-        mdoc_menu_and_blocks_from_nested_files(@dml_link_state, id: id)
+        mdoc_menu_and_blocks_from_nested_files(
+          @dml_link_state, source_id: source_id
+        )
       dump_delobj(@dml_blocks_in_file, @dml_menu_blocks, @dml_link_state)
     end