lithop 0.3.0 → 0.4.0

data/lib/lithop/model/z_region_model.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Lithop
+  # Restricts a material model to an arbitrary contiguous Z range.
+  class ZRegionModel
+    Cell = Data.define(:materials)
+
+    attr_reader :columns, :rows, :x_boundaries, :y_boundaries, :z_boundaries, :cells, :z_range
+
+    def initialize(model:, z_range:)
+      @columns = model.columns
+      @rows = model.rows
+      @x_boundaries = model.x_boundaries
+      @y_boundaries = model.y_boundaries
+      @z_range = z_range
+      source_layers = overlapping_layers(model.z_boundaries)
+      @z_boundaries = clipped_boundaries(model.z_boundaries, source_layers).freeze
+      @cells = model.cells.map do |cell|
+        Cell.new(materials: source_layers.map { |layer| cell.materials.fetch(layer) }.freeze)
+      end.freeze
+    end
+
+    def materials = @materials ||= cells.flat_map(&:materials).uniq.freeze
+
+    private
+
+    def overlapping_layers(boundaries)
+      layers = (0...(boundaries.length - 1)).select do |layer|
+        boundaries.fetch(layer) < z_range.end && boundaries.fetch(layer + 1) > z_range.begin
+      end
+      raise InputError, "Z region must overlap the material model" if layers.empty?
+
+      layers.freeze
+    end
+
+    def clipped_boundaries(boundaries, layers)
+      inner = layers.filter_map do |layer|
+        boundary = boundaries.fetch(layer + 1)
+        boundary if boundary > z_range.begin && boundary < z_range.end
+      end
+      [z_range.begin, *inner, z_range.end]
+    end
+  end
+end

data/lib/lithop/settings.rb

@@ -119,10 +119,9 @@ module Lithop
 
     def validate_z_parts!
       raise ConfigurationError, "separate_z_parts must be a boolean" unless [true, false].include?(separate_z_parts)
-      unless color_region_parts.is_a?(Integer) && color_region_parts.positive? &&
-             color_region_parts <= color_layer_count
-        raise ConfigurationError, "color_region_parts must be an integer from 1 to color_layer_count"
-      end
+      return if color_region_parts.is_a?(Integer) && color_region_parts.between?(1, Settings::MAXIMUM_Z_PARTS)
+
+      raise ConfigurationError, "color_region_parts must be an integer from 1 to #{Settings::MAXIMUM_Z_PARTS}"
     end
 
     def validate_layer_structure!
@@ -187,6 +186,17 @@ module Lithop
 
         raise ConfigurationError, "#{key} must be a finite percentage from -100 to 100"
       end
+      unless yellow_mix_percent.is_a?(Numeric) && yellow_mix_percent.finite? &&
+             yellow_mix_percent.between?(0.0, 100.0)
+        raise ConfigurationError, "yellow_mix_percent must be a finite percentage from 0 to 100"
+      end
+      unless Settings::YELLOW_MIX_COLORS.include?(yellow_mix_color)
+        raise ConfigurationError,
+              "yellow_mix_color must be one of: #{Settings::YELLOW_MIX_COLORS.join(", ")}"
+      end
+      return if [true, false].include?(suppress_pale_colors)
+
+      raise ConfigurationError, "suppress_pale_colors must be a boolean"
     end
 
     def validate_nozzle_diameter!
@@ -227,16 +237,27 @@ module Lithop
   # Validated dimensions, print parameters, and output limits for a generation job.
   # rubocop:disable-next Metrics/ClassLength
   class Settings
+    MAXIMUM_Z_PARTS = 3
+    MINIMUM_Z_PART_THICKNESS = 0.32
+    MINIMUM_Z_SOURCE_THICKNESS = MINIMUM_Z_PART_THICKNESS * MAXIMUM_Z_PARTS
+    Z_SEPARATED_COLOR_LAYER_COUNT = 8
+    Z_SEPARATED_FIRST_LAYER_HEIGHT = 0.1
+    Z_SEPARATED_LAYER_HEIGHT = 0.08
+    Z_PART_BASE_WHITE_LAYERS = 1
+    Z_PART_MINIMUM_TOTAL_LAYERS = 4
     include SettingsValidation
 
     MICRONS_PER_MM = LayerStructure::MICRONS_PER_MM
     COLOR_MODELS = %w[cmy].freeze
     NOZZLE_DIAMETERS = [0.2, 0.4].freeze
-    COLOR_LAYER_COUNTS = [4, 5, 7].freeze
+    COLOR_LAYER_COUNTS = [4, 5, 7, 8].freeze
     LAYOUT_PROFILES = ["standard"].freeze
     IMAGE_FITS = %w[cover contain].freeze
     TILE_LAYOUTS = %w[auto columns rows grid].freeze
+    YELLOW_MIX_COLORS = %w[cyan magenta].freeze
     PIGMENTS = %i[cyan magenta yellow].freeze
+    PIGMENT_ORDERS = PIGMENTS.permutation.map(&:freeze).freeze
+    DEFAULT_PIGMENT_ORDER = %i[yellow magenta cyan].freeze
     MINIMUM_TOP_WHITE_LAYERS = LayerStructure::MINIMUM_TOP_WHITE_LAYERS
     DEFAULTS = {
       layout_profile: "standard",
@@ -253,8 +274,11 @@ module Lithop
       brightness: 0.0,
       contrast: 0.0,
       saturation: 0.0,
-      minimum_thickness: 1.0,
-      maximum_thickness: 2.14689422,
+      suppress_pale_colors: false,
+      yellow_mix_color: "cyan",
+      yellow_mix_percent: 0.0,
+      minimum_thickness: 0.74,
+      maximum_thickness: 1.94,
       pixel_size: 0.22,
       color_pixel_size: nil,
       grid_columns: 637,
@@ -266,16 +290,16 @@ module Lithop
       separate_z_parts: false,
       color_region_parts: 3,
       first_layer_height: 0.1,
-      layer_height: 0.1,
-      base_white_layers: 2,
-      top_layer_height: 0.04,
-      top_white_start: 1.0,
-      minimum_top_white_layers: 0,
-      exact_maximum_thickness: true,
+      layer_height: 0.08,
+      base_white_layers: 1,
+      top_layer_height: 0.08,
+      top_white_start: nil,
+      minimum_top_white_layers: 1,
+      exact_maximum_thickness: false,
       nozzle_diameter: 0.2,
       color_model: "cmy",
       color_layer_count: 7,
-      pigment_order: PIGMENTS,
+      pigment_order: DEFAULT_PIGMENT_ORDER,
       bambu_project: true,
       maximum_input_pixels: 20_000_000,
       maximum_triangles: 5_000_000
@@ -290,6 +314,7 @@ module Lithop
       settings = DEFAULTS.merge(values).merge(layout_profile: profile)
       DEFAULTS.each_key { |key| instance_variable_set("@#{key}", settings.fetch(key)) }
       @pigment_order = normalize_pigment_order(@pigment_order)
+      apply_z_separated_layer_structure! if @separate_z_parts
       validate!
       @layer_structure = LayerStructure.new(
         first_layer_height:, layer_height:, color_layer_count:, minimum_thickness:, maximum_thickness:,
@@ -304,6 +329,7 @@ module Lithop
 
       validate_physical_minimum!
       validate_separated_top_white!
+      validate_z_separated_thickness_range!
     end
 
     def without_default_grid(values)
@@ -315,6 +341,18 @@ module Lithop
     end
     private :without_default_grid
 
+    def apply_z_separated_layer_structure!
+      @color_layer_count = Z_SEPARATED_COLOR_LAYER_COUNT
+      @first_layer_height = Z_SEPARATED_FIRST_LAYER_HEIGHT
+      @layer_height = Z_SEPARATED_LAYER_HEIGHT
+      @top_layer_height = Z_SEPARATED_LAYER_HEIGHT
+      @top_white_start = ((@base_white_layers * @first_layer_height) +
+                          (@color_layer_count * @layer_height)).round(9)
+      @minimum_thickness = [@minimum_thickness, @top_white_start + @top_layer_height].max.round(9)
+      @exact_maximum_thickness = false
+    end
+    private :apply_z_separated_layer_structure!
+
     def columns = sampling_grid.columns
     def rows = sampling_grid.rows
     def effective_color_pixel_size = color_pixel_size || pixel_size
@@ -334,6 +372,77 @@ module Lithop
     def resolved_tile_rows = resolved_tile_shape.fetch(0)
     def resolved_tile_columns = resolved_tile_shape.fetch(1)
 
+    def resolved_z_part_boundaries
+      @resolved_z_part_boundaries ||= begin
+        start = layer_structure.base_white_thickness
+        source_thickness = z_separated_minimum_thickness / color_region_parts
+        boundaries = Array.new(color_region_parts) do |index|
+          (start + (index * source_thickness)).round(9)
+        end
+        [*boundaries, z_separated_source_end].freeze
+      end
+    end
+
+    def resolved_z_part_ranges
+      @resolved_z_part_ranges ||= resolved_z_part_boundaries.each_cons(2).map do |start, finish|
+        start...finish
+      end.freeze
+    end
+
+    def resolved_z_color_ranges
+      color_start = layer_structure.color_region_start
+      color_end = layer_structure.color_region_end
+      resolved_z_part_ranges.map do |range|
+        [range.begin, color_start].max...[range.end, color_end].min
+      end.freeze
+    end
+
+    def resolved_z_part_count = color_region_parts
+
+    def z_separated_minimum_thickness
+      MINIMUM_Z_SOURCE_THICKNESS.round(9)
+    end
+
+    def z_separated_source_end
+      (layer_structure.base_white_thickness + z_separated_minimum_thickness).round(9)
+    end
+
+    def z_part_base_white_layers(index = 0)
+      return Z_PART_BASE_WHITE_LAYERS unless separate_z_parts
+
+      source_layers = (z_part_minimum_source_thickness(index) / layer_height).round
+      [Z_PART_BASE_WHITE_LAYERS, Z_PART_MINIMUM_TOTAL_LAYERS - source_layers].max
+    end
+
+    def z_part_base_white_thickness(index = 0)
+      layers = z_part_base_white_layers(index)
+      (first_layer_height + ((layers - 1) * layer_height)).round(9)
+    end
+
+    def z_part_minimum_build_thickness
+      resolved_z_part_ranges.each_index.map do |index|
+        (z_part_minimum_source_thickness(index) + z_part_base_white_thickness(index)).round(9)
+      end.min
+    end
+
+    def z_separated_output_minimum_thickness
+      without_source_base = effective_minimum_thickness - layer_structure.base_white_thickness
+      (without_source_base + z_part_base_white_thicknesses.sum).round(9)
+    end
+
+    def z_separated_output_maximum_thickness
+      without_source_base = effective_maximum_thickness - layer_structure.base_white_thickness
+      (without_source_base + z_part_base_white_thicknesses.sum).round(9)
+    end
+
+    def z_part_base_white_layers_by_plate
+      resolved_z_part_ranges.each_index.map { |index| z_part_base_white_layers(index) }.freeze
+    end
+
+    def z_part_base_white_thicknesses
+      resolved_z_part_ranges.each_index.map { |index| z_part_base_white_thickness(index) }.freeze
+    end
+
     def estimated_triangles
       (4 * columns * rows) + (4 * (columns + rows))
     end
@@ -372,6 +481,15 @@ module Lithop
         effective_color_pixel_size: effective_color_pixel_size,
         effective_minimum_thickness: effective_minimum_thickness,
         effective_maximum_thickness: effective_maximum_thickness,
+        minimum_z_part_thickness: MINIMUM_Z_PART_THICKNESS,
+        z_part_base_white_layers: Z_PART_BASE_WHITE_LAYERS,
+        z_part_base_white_thickness: z_part_base_white_thickness,
+        z_part_minimum_build_thickness: z_part_minimum_build_thickness,
+        resolved_z_part_count: resolved_z_part_count,
+        z_separated_minimum_thickness: z_separated_minimum_thickness,
+        z_separated_output_minimum_thickness: z_separated_output_minimum_thickness,
+        z_separated_output_maximum_thickness: z_separated_output_maximum_thickness,
+        z_separated_source_end: z_separated_source_end,
         columns: columns, rows: rows, pixel_size_x: pixel_size_x, pixel_size_y: pixel_size_y,
         resolved_tile_rows: resolved_tile_rows, resolved_tile_columns: resolved_tile_columns
       )
@@ -379,6 +497,12 @@ module Lithop
 
     private
 
+    def z_part_minimum_source_thickness(index)
+      range = resolved_z_part_ranges.fetch(index)
+      source_end = [range.end, effective_minimum_thickness].min
+      [source_end - range.begin, 0.0].max.round(9)
+    end
+
     def automatic_tile_shape
       factors = factor_shapes.map do |row_count, column_count|
         tile_width = width.fdiv(column_count)
@@ -402,9 +526,17 @@ module Lithop
 
     def validate_separated_top_white!
       return unless separate_z_parts
-      return if effective_minimum_thickness > layer_structure.color_region_end
+      return if z_separated_source_end > layer_structure.color_region_end
 
       raise ConfigurationError, "separate_z_parts requires a positive top White thickness"
     end
+
+    def validate_z_separated_thickness_range!
+      return unless separate_z_parts
+      return if z_separated_source_end <= effective_maximum_thickness
+
+      raise ConfigurationError,
+            "Z separation requires maximum_thickness of at least #{z_separated_source_end} mm"
+    end
   end
 end

data/lib/lithop/settings_file.rb

@@ -39,6 +39,7 @@ module Lithop
       values[:image_fit] = values[:image_fit].downcase if values[:image_fit].is_a?(String)
       values[:layout_profile] = values[:layout_profile].downcase if values[:layout_profile].is_a?(String)
       values[:tile_layout] = values[:tile_layout].downcase if values[:tile_layout].is_a?(String)
+      values[:yellow_mix_color] = values[:yellow_mix_color].downcase if values[:yellow_mix_color].is_a?(String)
       values
     end
     private_class_method :normalize_values

data/lib/lithop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lithop
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/lithop/web/app.rb

@@ -155,7 +155,7 @@ module Lithop
         content_type :json
         JSON.generate(
           tile_count: resolved.tile_count, tile_rows: layout.rows, tile_columns: layout.columns,
-          z_plate_count: resolved.separate_z_parts ? resolved.color_region_parts + 1 : 1
+          z_plate_count: resolved.separate_z_parts ? resolved.resolved_z_part_count : 1
         )
       rescue Error, SystemCallError => e
         halt 422, json_error(e.message)
@@ -360,10 +360,7 @@ module Lithop
       def prepare_page(submitted: nil)
         form = SettingsForm.new(project_dir: settings.project_dir)
         @values = form.values
-        if submitted
-          SettingsForm::FIELD_NAMES.each { |key| @values[key] = submitted[key] if submitted.key?(key) }
-          @values["separate_z_parts"] = submitted["separate_z_parts"] == "1"
-        end
+        apply_submitted_values(submitted) if submitted
         @jobs = settings.job_store.recent.map do |job|
           job.merge(settings.job_store.summary(job.fetch("job_id")))
         end
@@ -378,6 +375,13 @@ module Lithop
         @csrf_token = settings.csrf_token
       end
 
+      def apply_submitted_values(submitted)
+        SettingsForm::FIELD_NAMES.each { |key| @values[key] = submitted[key] if submitted.key?(key) }
+        SettingsForm::BOOLEAN_FIELDS.each do |key|
+          @values[key.to_s] = submitted[key.to_s] == "1"
+        end
+      end
+
       def prepare_navigation
         @selected_job_id = params["job"]
         requested_view = params["view"].to_s

data/lib/lithop/web/public/app.css

@@ -10,6 +10,7 @@
   --yellow: #f4d800;
   --green: #1f6d50;
   --danger: #a83131;
+  --site-header-height: 116px;
   font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
 }
 
@@ -31,7 +32,8 @@ button:focus-visible, input:focus-visible, select:focus-visible, summary:focus-v
   outline-offset: 2px;
 }
 
-.site-header { position: sticky; top: 0; z-index: 20; display: flex; align-items: center; gap: 14px; min-height: 64px; padding: 9px max(20px, calc((100vw - 1800px) / 2)); border-bottom: 1px solid rgba(217,215,205,.9); background: rgba(243,241,233,.94); box-shadow: 0 8px 28px rgba(38,48,42,.06); backdrop-filter: blur(14px); }
+.site-header { position: sticky; top: 0; z-index: 20; border-bottom: 1px solid rgba(217,215,205,.9); background: rgba(243,241,233,.94); box-shadow: 0 8px 28px rgba(38,48,42,.06); backdrop-filter: blur(14px); }
+.site-header-main { display: flex; align-items: center; gap: 14px; min-height: 64px; padding: 9px max(20px, calc((100vw - 1800px) / 2)); }
 .brand-block { display: grid; gap: 1px; min-width: 128px; }
 .brand { color: var(--ink); font: 500 1.8rem/.9 Georgia,"Times New Roman",serif; letter-spacing: -.045em; text-decoration: none; }
 .eyebrow, .step { margin: 0 0 10px; color: var(--green); font-size: 0.72rem; font-weight: 800; letter-spacing: 0.17em; }
@@ -40,30 +42,32 @@ button:focus-visible, input:focus-visible, select:focus-visible, summary:focus-v
 .header-context .project-name { overflow: hidden; max-width: 220px; text-overflow: ellipsis; white-space: nowrap; }
 .header-context strong { color: var(--ink); }
 .global-job-control { display: flex; align-items: center; gap: 4px; margin-left: auto; border: 1px solid var(--line); border-radius: 11px; padding: 3px; background: rgba(255,255,255,.72); }
-.header-action, .menu-toggle { border: 0; border-radius: 8px; padding: 8px 10px; color: var(--ink); background: transparent; cursor: pointer; font-size: .74rem; font-weight: 800; }
-.header-action:hover, .menu-toggle:hover { background: #e6e9e3; }
+.header-action { border: 0; border-radius: 8px; padding: 8px 10px; color: var(--ink); background: transparent; cursor: pointer; font-size: .74rem; font-weight: 800; }
+.header-action:hover { background: #e6e9e3; }
 #global-job-link { display: flex; align-items: baseline; gap: 8px; }
 #global-job-link small { color: var(--muted); font: .68rem ui-monospace,monospace; }
-.menu-toggle { display: none; font-size: 1.1rem; }
 .local-badge, .state-pill, .dimension-badge { border: 1px solid var(--line); border-radius: 999px; padding: 8px 13px; background: rgba(255, 255, 255, 0.72); font: 700 0.72rem ui-monospace, SFMono-Regular, Menlo, monospace; }
 .context-badge { border-radius: 999px; padding: 7px 12px; color: var(--green); background: #e8f2ec; font-size: 0.72rem; font-weight: 800; }
 
 .workspace { width: min(1800px, calc(100% - 40px)); margin-inline: auto; padding: 20px 0 80px; }
-.app-shell { display: grid; grid-template-columns: 160px minmax(0,1fr); align-items: start; gap: 18px; }
+.app-shell { min-width: 0; }
 .app-content, .app-view { min-width: 0; }
 .view-title { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; }
-.primary-navigation { position: sticky; top: 84px; display: grid; gap: 7px; }
-.primary-navigation button { display: grid; grid-template-columns: 26px minmax(0,1fr); gap: 1px 7px; width: 100%; border: 1px solid transparent; border-radius: 12px; padding: 11px; color: var(--ink); background: transparent; text-align: left; cursor: pointer; font-weight: 800; }
-.primary-navigation button span { grid-row: 1 / 3; color: var(--muted); font: .66rem ui-monospace,monospace; }
-.primary-navigation button small { color: var(--muted); font-size: .66rem; font-weight: 500; }
+.primary-navigation { display: flex; gap: 4px; overflow-x: auto; padding: 0 max(20px, calc((100vw - 1800px) / 2)); scrollbar-width: thin; }
+.primary-navigation button { flex: none; display: flex; align-items: baseline; gap: 7px; border: 0; border-bottom: 3px solid transparent; border-radius: 7px 7px 0 0; padding: 10px 14px 9px; color: var(--ink); background: transparent; cursor: pointer; }
+.primary-navigation button span { color: var(--muted); font: .66rem ui-monospace,monospace; }
+.primary-navigation button strong { font-size: .8rem; }
+.primary-navigation button small { color: var(--muted); font-size: .68rem; font-weight: 500; }
 .primary-navigation button:hover { background: rgba(255,255,255,.62); }
-.primary-navigation button[aria-current="page"] { border-color: var(--line); background: var(--panel); box-shadow: 0 8px 24px rgba(38,48,42,.06); }
+.primary-navigation button[aria-current="page"] { border-bottom-color: var(--green); background: rgba(255,255,255,.72); }
 .workspace-primary { display: grid; grid-template-columns: minmax(360px,400px) minmax(0,1fr); align-items: start; gap: 18px; }
 .jobs-workspace { display: grid; grid-template-columns: minmax(300px,350px) minmax(0,1fr); grid-template-areas: "history detail"; align-items: start; gap: 18px; }
-.jobs-workspace .history-panel { grid-area: history; position: sticky; top: 84px; max-height: calc(100vh - 104px); overflow: auto; }
+.presets-workspace { display: grid; grid-template-columns: minmax(240px,300px) minmax(0,880px); align-items: start; gap: 18px; }
+.jobs-workspace .history-panel { grid-area: history; position: sticky; top: calc(var(--site-header-height) + 20px); max-height: calc(100vh - var(--site-header-height) - 40px); overflow: auto; }
+.preset-list-panel { position: sticky; top: calc(var(--site-header-height) + 20px); }
 .jobs-workspace .job-panel { grid-area: detail; }
 .panel { min-width: 0; border: 1px solid var(--line); border-radius: 22px; background: rgba(255, 253, 248, 0.96); box-shadow: 0 18px 50px rgba(38, 48, 42, 0.07); padding: clamp(20px, 3vw, 34px); }
-.preview-panel { position: sticky; top: 84px; }
+.preview-panel { position: sticky; top: calc(var(--site-header-height) + 20px); }
 .notice { padding: 13px 16px; border-radius: 12px; }
 .notice.error { color: var(--danger); background: #fff0ed; border: 1px solid #efc0b8; }
 .notice.info { color: #405049; background: #eef4f0; border: 1px solid #cbd9d0; }
@@ -80,7 +84,15 @@ button:focus-visible, input:focus-visible, select:focus-visible, summary:focus-v
 .file-title { font-weight: 800; }
 #file-name { color: var(--muted); font-size: 0.84rem; }
 
-.settings-section { margin-top: 12px; border: 1px solid var(--line); border-radius: 14px; background: rgba(255,255,255,0.5); }
+.conversion-actions { display: grid; gap: 9px; margin-top: 12px; border: 1px solid var(--line); border-radius: 14px; padding: 10px; background: rgba(255,253,248,.97); box-shadow: 0 10px 28px rgba(20,35,29,.11); }
+.conversion-action-row { display: flex; align-items: center; gap: 14px; }
+#draft-state { flex: 1; color: var(--muted); font-size: .76rem; line-height: 1.45; }
+.conversion-actions .notice { margin: 0; }
+.settings-navigation { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 14px; padding-bottom: 12px; border-bottom: 1px solid var(--line); }
+.settings-navigation button { border: 1px solid var(--line); border-radius: 999px; padding: 7px 10px; color: var(--muted); background: white; cursor: pointer; font-size: .72rem; font-weight: 800; }
+.settings-navigation button:hover { border-color: #aeb8b2; color: var(--ink); }
+.settings-navigation button[aria-current="true"] { border-color: var(--green); color: var(--green); background: #edf7f0; }
+.settings-section { scroll-margin-top: calc(var(--site-header-height) + 20px); margin-top: 12px; border: 1px solid var(--line); border-radius: 14px; background: rgba(255,255,255,0.5); }
 .settings-section > summary { display: flex; align-items: baseline; justify-content: space-between; gap: 18px; padding: 15px 16px; cursor: pointer; list-style: none; font-weight: 800; }
 .settings-section > summary::-webkit-details-marker { display: none; }
 .settings-section > summary::after { content: "+"; order: 3; color: var(--green); font-size: 1.2rem; }
@@ -109,16 +121,21 @@ input:invalid:not(:placeholder-shown) { border-color: var(--danger); }
 .danger-text { color: var(--danger); }
 .settings-library { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 10px 14px; padding-top: 14px; }
 .settings-library > label { display: grid; gap: 5px; color: var(--muted); font-size: .76rem; }
+.preset-select-label { display: grid; gap: 6px; color: var(--muted); font-size: .76rem; }
+.preset-apply-button { width: 100%; margin-top: 10px; }
+.draft-apply { display: grid; gap: 6px; margin-top: 18px; border-top: 1px solid var(--line); padding-top: 16px; }
+.draft-apply small { color: var(--muted); font-size: .72rem; line-height: 1.45; }
+.draft-apply .secondary-button { margin-top: 3px; }
 .library-actions { grid-column: 1 / -1; display: flex; flex-wrap: wrap; align-items: center; gap: 8px 14px; }
 .draft-actions { padding-top: 10px; border-top: 1px solid var(--line); }
 .settings-library .fine-print { grid-column: 1 / -1; margin: 0; }
-.settings-shortcut { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-top: 14px; border: 1px solid var(--line); border-radius: 14px; padding: 13px 15px; background: #f8f8f3; }
-.settings-shortcut div { display: grid; gap: 3px; }
-.settings-shortcut small, .preset-intro { color: var(--muted); font-size: .74rem; line-height: 1.5; }
-.settings-shortcut .secondary-button { flex: none; padding: 9px 12px; font-size: .74rem; }
-.preset-panel { max-width: 880px; }
+.preset-intro { color: var(--muted); font-size: .74rem; line-height: 1.5; }
 .preset-panel .settings-library { margin-top: 18px; border-top: 1px solid var(--line); }
-.draft-summary { margin-top: 16px; border: 1px solid var(--line); border-radius: 14px; padding: 14px 16px; background: #f8f8f3; }
+.draft-summary { border-top: 1px solid var(--line); padding: 9px 3px 1px; }
+.draft-summary > summary { cursor: pointer; list-style: none; }
+.draft-summary > summary::-webkit-details-marker { display: none; }
+.draft-summary > summary::after { content: "詳細を見る"; color: var(--green); font-size: .7rem; font-weight: 800; }
+.draft-summary[open] > summary::after { content: "詳細を閉じる"; }
 .summary-heading { display: flex; justify-content: space-between; gap: 16px; font-size: 0.8rem; }
 .summary-heading span { color: var(--muted); }
 .summary-heading span[data-changed="true"] { color: #925c00; font-weight: 800; }
@@ -126,8 +143,6 @@ input:invalid:not(:placeholder-shown) { border-color: var(--danger); }
 .draft-summary dt { color: var(--muted); }
 .draft-summary dd { overflow-wrap: anywhere; margin: 0; }
 
-.submit-bar { position: sticky; bottom: 12px; z-index: 4; display: flex; align-items: center; gap: 14px; margin-top: 18px; padding: 10px; border: 1px solid var(--line); border-radius: 14px; background: rgba(255,253,248,0.95); box-shadow: 0 10px 30px rgba(20,35,29,0.12); backdrop-filter: blur(10px); }
-#draft-state { flex: 1; color: var(--muted); font-size: 0.76rem; }
 .primary-button, .secondary-button, .danger-button { border: 0; border-radius: 11px; padding: 12px 18px; font-weight: 800; cursor: pointer; }
 .primary-button { color: white; background: var(--ink); }
 .primary-button:hover { background: var(--green); }
@@ -218,9 +233,12 @@ button:disabled { opacity: 0.5; cursor: wait; }
 
 .history-controls { display: grid; grid-template-columns: minmax(180px,2fr) repeat(4,minmax(130px,1fr)); gap: 10px; margin-bottom: 14px; }
 .history-controls label { display: grid; gap: 4px; color: var(--muted); font-size: 0.72rem; }
-.history-selection-actions { display: flex; flex-wrap: wrap; align-items: center; justify-content: flex-end; gap: 9px; margin-bottom: 14px; }
-.history-selection-actions span { margin-right: auto; color: var(--muted); font-size: .76rem; }
-.history-selection-actions button { padding: 8px 12px; font-size: .74rem; }
+.history-selection-toolbar { display: grid; gap: 9px; margin-bottom: 14px; border: 1px solid var(--line); border-radius: 12px; padding: 10px; background: #f8f7f1; }
+.history-selection-summary { display: flex; align-items: center; justify-content: space-between; gap: 10px; min-height: 30px; }
+.history-selection-summary span { min-width: 0; color: var(--muted); font-size: .76rem; }
+.history-selection-summary .text-button { flex: none; padding: 6px 4px; }
+.history-selection-actions { display: grid; grid-template-columns: minmax(0, .8fr) minmax(0, 1.2fr); gap: 8px; }
+.history-selection-actions button { width: 100%; min-height: 38px; padding: 8px; font-size: .72rem; }
 .job-list { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 10px; }
 .job-list li { position: relative; display: grid; grid-template-columns: auto minmax(0,1fr); align-items: start; gap: 8px; min-width: 0; }
 .job-list .history-select { width: 18px; height: 18px; margin-top: 13px; accent-color: var(--green); }
@@ -232,8 +250,6 @@ button:disabled { opacity: 0.5; cursor: wait; }
 .job-list small, .empty-copy { color: var(--muted); }
 .job-list .history-thumbnail { width: 100%; aspect-ratio: 140 / 104; object-fit: contain; border-radius: 6px; background: #f0efe9; }
 .jobs-workspace .history-controls, .jobs-workspace .job-list { grid-template-columns: 1fr; }
-.jobs-workspace .history-selection-actions { justify-content: flex-start; }
-.jobs-workspace .history-selection-actions span { flex-basis: 100%; }
 .history-delete { grid-column: 2; margin-top: 6px; border: 0; padding: 3px 1px; color: #8d2525; background: transparent; cursor: pointer; font-size: 0.72rem; }
 .load-more { display: block; margin: 18px auto 0; }
 .preview-dialog { width: min(1320px, calc(100vw - 32px)); max-width: none; height: min(880px, calc(100vh - 32px)); max-height: none; border: 1px solid var(--line); border-radius: 20px; padding: 22px; color: var(--ink); background: var(--panel); box-shadow: 0 28px 90px rgba(10,20,15,.35); }
@@ -264,12 +280,6 @@ button:disabled { opacity: 0.5; cursor: wait; }
 [hidden] { display: none !important; }
 
 @media (max-width: 1439px) {
-  .menu-toggle { display: block; }
-  .app-shell { grid-template-columns: 1fr; }
-  .primary-navigation { position: fixed; z-index: 31; top: 0; bottom: 0; left: 0; width: min(280px,calc(100vw - 52px)); align-content: start; padding: 78px 16px 20px; background: var(--panel); box-shadow: 18px 0 50px rgba(20,35,29,.2); transform: translateX(-105%); transition: transform 160ms ease; }
-  body.navigation-open .primary-navigation { transform: translateX(0); }
-  .navigation-scrim { position: fixed; z-index: 30; inset: 0; background: rgba(20,35,29,.42); }
-  body.navigation-open .navigation-scrim { display: block !important; }
   .workspace-primary { grid-template-columns: minmax(340px,.8fr) minmax(0,1.2fr); }
   .jobs-workspace { grid-template-columns: minmax(290px,340px) minmax(0,1fr); }
 }
@@ -277,6 +287,8 @@ button:disabled { opacity: 0.5; cursor: wait; }
 @media (max-width: 900px) {
   .workspace-primary { grid-template-columns: 1fr; }
   .preview-panel { position: static; }
+  .presets-workspace { grid-template-columns: 1fr; }
+  .preset-list-panel { position: static; }
   .jobs-workspace { grid-template-columns: 1fr; grid-template-areas: "history" "detail"; }
   .jobs-workspace .history-panel { position: static; max-height: none; }
   .workspace.has-job[data-view="jobs"]:not(.show-job-list) .jobs-workspace .history-panel { display: none; }
@@ -289,7 +301,8 @@ button:disabled { opacity: 0.5; cursor: wait; }
 }
 
 @media (max-width: 680px) {
-  .site-header { gap: 8px; padding-inline: 11px; }
+  .site-header-main { gap: 8px; padding-inline: 11px; }
+  .primary-navigation { padding-inline: 11px; }
   .brand-block { min-width: 80px; }
   .brand-block .eyebrow, .header-context .project-name, .header-context > span[aria-hidden], #help-button { display: none; }
   .brand { font-size: 1.5rem; }
@@ -305,11 +318,9 @@ button:disabled { opacity: 0.5; cursor: wait; }
   .dialog-preview-grid .result-preview { max-height: calc((100vh - 250px) / 2); }
   .draft-summary dl { grid-template-columns: 1fr; gap: 2px; }
   .draft-summary dd { margin-bottom: 7px; }
-  .submit-bar { align-items: stretch; flex-direction: column; }
-  .submit-bar .primary-button { width: 100%; }
+  .conversion-action-row { align-items: stretch; flex-direction: column; }
+  .conversion-action-row .primary-button { width: 100%; }
   .settings-section summary small { display: none; }
-  .settings-shortcut { align-items: stretch; flex-direction: column; }
-  .settings-shortcut .secondary-button { width: 100%; }
   .job-detail-tabs { overflow-x: auto; }
 }