@zalom/plastic 2.0.0-alpha.9 → 2.0.2

package/scripts/lib/intent_screen.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require_relative "store_layout"
 # frozen_string_literal: true
 # IntentScreen (intent 316) - fills templates/intent-screen.md from one intent's
 # record: the intent file, the tier's INDEX.md, savepoint.md and checklist.md.
@@ -101,9 +102,8 @@ module IntentScreen
   # --- store ---------------------------------------------------------------------
 
   def self.store_fields(store_root)
-    parent = File.basename(File.dirname(store_root))
-    if parent == "projects"
-      slug = File.basename(store_root)
+    slug = Plastic::StoreLayout.locate(File.join(store_root, "store")).last
+    if slug != Plastic::StoreLayout::GLOBAL
       { "store" => "project:#{slug}", "store.note" => "the #{slug} project store" }
     else
       { "store" => "global", "store.note" => "the global store" }
@@ -287,7 +287,7 @@ module IntentScreen
   # Returns [clause_without_terminal_punctuation, remainder_or_nil]. `nil` for
   # the remainder means either no boundary exists at all, or the boundary
   # sits at the absolute end of `text` (a single trailing clause with nothing
-  # after it) — both cases where there is no SECOND clause to fold in.
+  # after it) — both cases where there is no SECOND clause to merge in.
   def self.clause_and_rest(text)
     m = text.match(/\A(.+?)[.;](\s+(.*)|\z)/m)
     return [text, nil] unless m

package/scripts/lib/intent_screen_ansi.rb

@@ -35,10 +35,26 @@ module IntentScreenAnsi
   BAR_CELLS = 24
   EIGHTHS = [" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉", "█"].freeze
 
-  DEFAULT_WIDTH = 100
+  # Intent 317a1 (D14): the approved design is a 115-column layout, measured
+  # from design--terminal-output.html:52-58 with its tags stripped.
+  DEFAULT_WIDTH = 115
 
   ELLIPSIS = "…"
 
+  # Intent 317a1 (D9-D11, D15): the three-column field table's geometry.
+  # ANSI_RE strips escapes so padding measures what the terminal actually
+  # draws (D10); VALUE_COL_MAX is the design's own value-column figure and
+  # the owner's "50 chars" (mockup--report-screen.md:74); NOTE_FLOOR is the
+  # minimum note length that earns the own-line fallback when the note alone
+  # (not the value) is what overflows the same-line budget.
+  ANSI_RE = /\e\[[0-9;]*m/.freeze
+  VALUE_COL_MAX = 50
+  NOTE_FLOOR = 24
+
+  def self.visible_width(text)
+    text.to_s.gsub(ANSI_RE, "").length
+  end
+
   def self.render(intent_dir:, store_root:, color: true, width: DEFAULT_WIDTH, markdown_safe: false)
     base = File.basename(intent_dir)
     id = base.split("--", 2).first
@@ -81,18 +97,8 @@ module IntentScreenAnsi
       ["Insight", fields["insight"], fields["insight.note"], false],
     ]
     key_width = field_rows.map { |k, _, _, _| k.length }.max
-    prefix_width = key_width + 4 # "  " + key.ljust + "  "
-
-    field_rows.each do |key, value, note, prebuilt|
-      value_budget = [width - prefix_width, 0].max
-      value_text = prebuilt ? value : fit_plain(value, value_budget)
-      out << "  #{styled(key.ljust(key_width), color, BOLD)}  #{value_text}\n"
-      next if note.to_s.empty?
 
-      note_budget = [width - prefix_width, 0].max
-      indent = " " * prefix_width
-      out << "#{indent}#{fit(note, note_budget) { |t| styled(t, color, MIDGREY) }}\n"
-    end
+    out << field_table_lines(field_rows, width: width, color: color, key_width: key_width)
 
     out << "\n"
     out << fit("Steps", width) { |t| styled(t, color, BOLD, NEARWHITE) }
@@ -119,6 +125,61 @@ module IntentScreenAnsi
     out
   end
 
+  # --- shared field-table geometry (D9-D12, D14, D15) ------------------------
+
+  # The field table's basis, cap, budget arithmetic, both fallbacks, and the
+  # right-strip, shared by `render` above and `ScreenPaint.paint_table`'s
+  # `**Key**` branch, so the two renderers can never drift apart (D12) - the
+  # duplication this replaced was character-for-character identical apart
+  # from the module prefix. `rows` is `[key, value, note]`, or `[key, value,
+  # note, true]` when `value` is already a finished, pre-fit string (the
+  # Progress bar) rather than raw text still needing `fit_plain`.
+  #
+  # Notes become a third column, padded to the widest RENDERED noted value
+  # (capped at VALUE_COL_MAX, D15) so every note starts at one raw-text
+  # position; a row whose value or note will not fit drops to the
+  # note-on-its-own-line form instead of squeezing anything invisibly. When
+  # the same-line budget has already collapsed to zero or less, the note
+  # falls straight to its own line rather than being fed to `fit` and
+  # silently returning "" - the note must be cut with a visible ellipsis or
+  # kept whole, never dropped outright (317a1 post-exec review, finding 4).
+  def self.field_table_lines(rows, width:, color:, key_width:)
+    prefix_width = key_width + 4 # "  " + key.ljust + "  "
+
+    rendered_rows = rows.map do |key, value, note, prebuilt|
+      value_budget = [width - prefix_width, 0].max
+      value_text = prebuilt ? value : fit_plain(value.to_s, value_budget)
+      [key.to_s, value_text, note.to_s]
+    end
+
+    noted_widths = rendered_rows.filter_map { |_, value_text, note| visible_width(value_text) unless note.empty? }
+    value_col = [noted_widths.max.to_i, VALUE_COL_MAX].min
+    note_budget = width - prefix_width - value_col - 2
+
+    out = +""
+    rendered_rows.each do |key, value_text, note|
+      row = "  #{styled(key.ljust(key_width), color, BOLD)}  #{value_text}"
+      if note.empty?
+        out << row.rstrip << "\n"
+        next
+      end
+
+      value_fits = visible_width(value_text) <= value_col
+      note_width = visible_width(note)
+      note_overflows = note_width > note_budget
+      note_fits = !note_overflows || (note_budget.positive? && note_width <= NOTE_FLOOR)
+      if value_fits && note_fits
+        pad = value_col - visible_width(value_text)
+        out << row << (" " * pad) << "  " << fit(note, note_budget) { |t| styled(t, color, MIDGREY) } << "\n"
+      else
+        out << row.rstrip << "\n"
+        own_budget = [width - prefix_width, 0].max
+        out << (" " * prefix_width) << fit(note, own_budget) { |t| styled(t, color, MIDGREY) } << "\n"
+      end
+    end
+    out
+  end
+
   # --- markdown-noise stripping, adapter-optional (intent 316a1, D3/D5) ------
   #
   # Not every display surface passes text through a Markdown renderer, so

package/scripts/lib/intent_validator.rb

@@ -149,7 +149,7 @@ module IntentValidator
 
   # PURE: combine the frontmatter result with section-structure findings for a
   # content STRING. Returns the frontmatter result hash extended with
-  # :section_missing, :section_unknown, and folded section errors; :ok is the AND
+  # :section_missing, :section_unknown, and merged section errors; :ok is the AND
   # of frontmatter and sections. Lets the create gate validate proposed content
   # (no file on disk) with the same definition as the CLI and doctor.
   def validate_content(content, known_stores: nil)
@@ -158,7 +158,7 @@ module IntentValidator
     merge_sections(fm_result, sections)
   end
 
-  # Fold section findings into a frontmatter result hash (shared by validate and
+  # Merge section findings into a frontmatter result hash (shared by validate and
   # validate_content). Does not mutate the input.
   def merge_sections(fm_result, sections)
     errors = fm_result[:errors].dup

package/scripts/lib/lock.rb

@@ -12,8 +12,8 @@ require "time"
 # savepoint.md (git-ignored, transient state). Ownership is session-keyed (D1):
 # the file records the owner session, never a pid. Liveness is a lease: the
 # owner's hooks touch the file mtime on tool calls (heartbeat); the lock is
-# stale only when that heartbeat is older than the TTL. The /tmp bridge is a
-# per-session CACHE of this state; on any disagreement the lock file wins (D2).
+# stale only when that heartbeat is older than the TTL. This lock file is
+# the sole truth of ownership (D2).
 #
 # Mutual-exclusion seam (D3): the schema carries a type ("delivery" now,
 # "maintenance" in a chained intent after 93) and acquire refuses while the
@@ -27,13 +27,12 @@ module Lock
   # Skill-invocation prefix per harness (intent 201, D2/D3). Claude Code invokes a
   # skill with a slash (/plastic-doctor); Codex CLI invokes explicitly with a
   # dollar ($plastic-doctor) and may also select one implicitly by matching the
-  # skill's description. This table is the actual source of truth for
-  # Bridge.skill_ref (bridge.rb requires lock.rb, never the reverse, so the
-  # table lives here rather than pulling Bridge into this dependency-free file
-  # just to render two characters). InstallerCore::DEFAULT_AGENTS carries the
-  # same values per adapter as documented config (see ACTION_2); this constant
-  # is not read from it at runtime, by the same reasoning bridge.rb/hook-*
-  # already stay clear of installer_core.rb (spec Alternatives Considered).
+  # skill's description. This table is the package-wide source of truth for
+  # `Lock.skill_ref`; every caller reaches it directly rather than duplicating
+  # the prefix table. InstallerCore::DEFAULT_AGENTS carries the same values per
+  # adapter as documented config (see ACTION_2); this constant is not read from
+  # it at runtime, by the same reasoning this file and hook-* already stay
+  # clear of installer_core.rb (spec Alternatives Considered).
   SKILL_PREFIXES = { "claude" => "/", "codex" => "$" }.freeze
 
   # Renders a skill reference for the given harness. Unset or unrecognized
@@ -369,8 +368,8 @@ module Lock
   # file is inert: nothing reads it, it stays zero bytes, and
   # scripts/end-intent:558 keys its exit contract on Lock.path alone. This is
   # a requirement, not a guarantee the code enforces: the curator stray-file
-  # rule (skills/conventions/references/maintenance-and-revisions.md:155)
-  # has no *.lock carve-out today, so a wrongful delete there degrades one
+  # rule (docs/help/maintenance-and-revisions.md:155) has no *.lock
+  # carve-out today, so a wrongful delete there degrades one
   # write window to the pre-fix (unguarded) behavior, not a hard failure.
   def with_write_guard(intent_dir, type: "delivery",
                        guard_timeout: WRITE_GUARD_TIMEOUT_SECONDS,