@zalom/plastic 1.0.0-beta.7 → 1.0.0-beta.9

package/PLASTIC.md

@@ -50,6 +50,13 @@ tags: [plastic, architecture]
 - Context contract: load `sources` strongly (they are what the intent was built from);
   traverse `chain` lightly for discovery. See
   docs/concepts/how-plastic-sources-and-chains-intents.md for the full model.
+- `## Links` (I5) is the human-readable projection of the graph. It mirrors the
+  frontmatter exactly: every entry is `- [[id--slug|<target's full intent: text>]]`, a
+  clickable `id--slug` wikilink target with the target intent's full `intent:` text as the
+  label (cross-store targets render `- [[store:id--slug|<target's full intent: text>]]`).
+  Ordering is mandatory: all `sources` first (top), then all `chain`, frontmatter order
+  preserved within each group. Sources never appear at the end. No source/chain tags, no
+  sub-grouping. An intent with empty `sources` and `chain` carries the empty-state comment.
 - IDs use Luhmann's alternating convention: `1` → `1a` → `1a1` → `1a1a`
 - Multiple branches increment: `1a`, `1b`, `1c`
 
@@ -164,8 +171,8 @@ Format: `ID--three-to-five-words` (all stores).
 - **Root (`15`, `16`)**: an independent thought, even if inspired by another intent.
   Reserve `sources` for true created-from provenance (intents this was built out of). An
   independent intent merely related to or inspired by another carries NO `sources`; record
-  the relation on the PREDECESSOR's `chain` (and mirror it as a `[[id]]` wikilink in
-  `## Links`).
+  the relation on the PREDECESSOR's `chain` (and mirror it as a
+  `[[id--slug|<target's full intent: text>]]` wikilink in `## Links`).
 - **Rule of thumb:** if the intent could exist without its parent, it's a root.
 
 ## INDEX.md

package/hooks/statusline

@@ -84,9 +84,34 @@ else
 fi
 INDEX_DIR=$(dirname "$INDEX")
 
-# --- Most-recently-accessed active intent (mirror dashboard: last savepoint ts) ---
+# --- Current-session work-unit: the live bridge wins over savepoint recency ---
+# The statusline receives the real session_id on stdin; the session's bridge
+# (plastic-{session_id}.json) is the authoritative "what THIS session is driving".
+# This beats the shared, savepoint-recency heuristic so parallel sessions on one
+# store no longer overwrite each other's line. grep/sed only - no jq, no ruby.
 WORK=""
-if [ -f "$INDEX" ]; then
+SID=$(json_str "session_id")
+if [ -n "$SID" ]; then
+  BRIDGE="${PLASTIC_TMP:-/tmp}/plastic-${SID}.json"
+  if [ -f "$BRIDGE" ]; then
+    # Bridge JSON is pretty-printed (one field per line). Scope extraction to the
+    # "intent" object so a sibling top-level "id"/"name" can never win (the intent
+    # object holds only string fields, so the first "}" closes it). grep/sed only.
+    INTENT_BLOCK=$(sed -n '/"intent"[[:space:]]*:[[:space:]]*{/,/}/p' "$BRIDGE" 2>/dev/null)
+    B_ID=$(printf '%s\n' "$INTENT_BLOCK" | grep -o '"id"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 \
+      | sed 's/.*"id"[[:space:]]*:[[:space:]]*"//;s/"$//')
+    B_NAME=$(printf '%s\n' "$INTENT_BLOCK" | grep -o '"name"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 \
+      | sed 's/.*"name"[[:space:]]*:[[:space:]]*"//;s/"$//')
+    if [ -n "$B_ID" ] && [ -n "$B_NAME" ]; then
+      EMDASH=$'\342\200\224'
+      WORK="${B_ID} ${EMDASH} ${B_NAME}"
+    fi
+  fi
+fi
+
+# --- Most-recently-accessed active intent (mirror dashboard: last savepoint ts) ---
+# Fallback only: runs when no session bridge resolved a work-unit above.
+if [ -z "$WORK" ] && [ -f "$INDEX" ]; then
   BEST_TS=""
   while IFS= read -r line; do
     [ -z "$line" ] && continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalom/plastic",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.9",
   "description": "Intent-driven idea development system for AI coding agents",
   "type": "module",
   "bin": {

package/scripts/doctor.rb

@@ -17,6 +17,9 @@ require "digest"
 
 require_relative "lib/qmd_sync"
 require_relative "lib/intent_validator"
+require_relative "lib/graph_rebuild"
+require_relative "lib/links_projection"
+require_relative "lib/links_section"
 
 # Diagnostic engine, instantiable with an injected store/agent map so tests can
 # run it hermetically (no eval, no global-constant rewriting).
@@ -480,9 +483,178 @@ class Doctor
     # flagged: validate_graph does not compute it.
     checks.concat(graph_invariant_checks(intent_dirs))
 
+    # cross_store_resolution — RESOLVES (not just shape-checks) every cross-store
+    # `store:id` ref against the FULL store family via the relocation map
+    # (relocation consulted first), closing the shape-only gap i1/i3/i4 leave open.
+    # Resolution always spans all stores even under `--store` scoping; only the
+    # REPORTED findings are filtered to refs originating in the scoped store(s).
+    checks << cross_store_resolution_check(scopes: scopes)
+
+    # graph_links_projection — the `## Links` section of every intent must EQUAL its
+    # canonical I5 frontmatter projection (intent 72), in BOTH set membership AND
+    # ordering (sources first, then chain). Recomputes the projection from each
+    # intent's sources/chain + the on-disk basenames using the SAME resolver the
+    # scripts/project-links tool uses, so the two can never diverge. Resolution
+    # spans all stores; only the REPORTED findings are filtered to the scoped store.
+    checks << links_projection_check(scopes: scopes)
+
     checks
   end
 
+  # Build the cross-store node maps (basename + label per store) + relocation map
+  # from ALL stores, then for every intent compute its canonical `## Links`
+  # projection and flag any whose ACTUAL `## Links` section differs (membership or
+  # ordering drift), or whose projection raises UnresolvedRef. `scopes` (nil = full
+  # run) filters only the REPORTED findings by origin scope.
+  def links_projection_check(scopes: nil)
+    all_dirs = all_intent_dirs
+
+    store_index = Hash.new { |h, k| h[k] = [] }
+    node_index = Hash.new { |h, k| h[k] = {} }
+    intents = [] # { scope:, id:, sources:, chain:, path: }
+
+    all_dirs.each do |d|
+      md = File.join(d[:path], "#{d[:name]}.md")
+      next unless File.exist?(md)
+
+      fm = parse_frontmatter(md)
+      next unless fm.is_a?(Hash) && fm["id"]
+
+      id = fm["id"].to_s
+      store_index[d[:scope]] << id
+      node_index[d[:scope]][id] = { basename: d[:name], label: fm["intent"].to_s.strip }
+      intents << {
+        scope: d[:scope], id: id, path: md,
+        sources: Array(fm["sources"]).map(&:to_s),
+        chain: Array(fm["chain"]).map(&:to_s),
+      }
+    end
+
+    relocation_map = GraphRebuild.build_relocation_map(cross_store_index_texts)
+
+    findings = []
+    intents.each do |node|
+      next if scopes && !scopes.include?(node[:scope])
+
+      resolve = ->(ref) do
+        LinksProjection.resolve_ref_projection(
+          ref, referer_store: node[:scope],
+               relocation_map: relocation_map, store_index: store_index, node_index: node_index
+        )
+      end
+
+      begin
+        expected = LinksProjection.section(sources: node[:sources], chain: node[:chain], resolve: resolve)
+        actual = actual_links_section(node[:path])
+      rescue LinksProjection::UnresolvedRef => e
+        findings << "#{node[:id]} ## Links projection failed: #{e.message}"
+        next
+      rescue LinksSection::AmbiguousLinks => e
+        findings << "#{node[:id]} ## Links ambiguous: #{e.message}"
+        next
+      end
+
+      next if actual == expected
+
+      findings << "#{node[:id]} ## Links does not match its frontmatter projection (membership/ordering drift)"
+    end
+
+    graph_finding_check(
+      "graph_links_projection", findings,
+      "Every intent's ## Links equals its frontmatter projection (membership and ordering)",
+      "Run scripts/project-links to regenerate the canonical ## Links sections"
+    )
+  end
+
+  # Extract a file's ACTUAL REAL `## Links` section text (FENCE-AWARE), normalized
+  # to the canonical block shape the projection emits. Delegates to the shared
+  # LinksSection.extract_section so the doctor check and the project-links tool
+  # agree on the section location and never match a `## Links` heading inside an
+  # example code fence. Returns "" when the section is absent (which differs from
+  # any real projection, so a missing section is a finding).
+  def actual_links_section(path)
+    LinksSection.extract_section(IntentValidator.body_of(File.read(path)))
+  end
+
+  # Build the relocation map + cross-store store_index from ALL stores, then for
+  # every intent's cross-store `sources`/`chain` ref resolve it and flag:
+  #   - DEAD: the target resolves nowhere
+  #   - RELOCATED-STALE: the ref points at an old location the relocation log has
+  #     moved (the resolved location differs from the literal ref), e.g. the
+  #     `global:24` id-reuse hazard that direct resolution would silently accept.
+  # `scopes` (nil = full run) filters only the REPORTED findings by origin scope.
+  def cross_store_resolution_check(scopes: nil)
+    all_dirs = all_intent_dirs
+
+    # Per-scope node maps + store_index over the WHOLE family.
+    nodes_by_scope = Hash.new { |h, k| h[k] = {} }
+    store_index = Hash.new { |h, k| h[k] = [] }
+    all_dirs.each do |d|
+      md = File.join(d[:path], "#{d[:name]}.md")
+      next unless File.exist?(md)
+
+      fm = parse_frontmatter(md)
+      next unless fm.is_a?(Hash) && fm["id"]
+
+      id = fm["id"].to_s
+      store_index[d[:scope]] << id
+      nodes_by_scope[d[:scope]][id] = {
+        sources: Array(fm["sources"]).map(&:to_s),
+        chain: Array(fm["chain"]).map(&:to_s),
+      }
+    end
+
+    relocation_map = GraphRebuild.build_relocation_map(cross_store_index_texts)
+
+    findings = []
+    nodes_by_scope.each do |scope, nodes|
+      next if scopes && !scopes.include?(scope)
+
+      nodes.each do |id, edges|
+        %i[sources chain].each do |field|
+          edges[field].each do |ref|
+            next unless ref.include?(":") # only cross-store refs are resolved here
+
+            res = GraphRebuild.resolve_ref(ref, referer_store: scope,
+                                                relocation_map: relocation_map,
+                                                store_index: store_index)
+            case res[:status]
+            when :dead
+              findings << "#{id}.#{field} cross-store ref #{ref} resolves to no intent (dead)"
+            when :same_store
+              findings << "#{id}.#{field} cross-store ref #{ref} is relocated-stale (now same-store #{res[:id]})"
+            when :cross_store
+              findings << "#{id}.#{field} cross-store ref #{ref} is relocated-stale (now #{res[:ref]})" if res[:ref] != ref
+            end
+          end
+        end
+      end
+    end
+
+    graph_finding_check(
+      "graph_cross_store_resolution", findings,
+      "Every cross-store sources/chain ref resolves to a live, current intent",
+      "Run scripts/rebuild-graph to repoint/collapse/drop stale cross-store refs"
+    )
+  end
+
+  # { store_key => INDEX.md text } for every store (global + all projects), for the
+  # relocation-map builder. Reads INDEX.md one level above each store dir.
+  def cross_store_index_texts
+    texts = {}
+    global_index = File.join(plastic_home, "INDEX.md")
+    texts["global"] = File.read(global_index) if File.exist?(global_index)
+
+    projects_root = File.join(plastic_home, "projects")
+    if File.directory?(projects_root)
+      Dir.children(projects_root).each do |project|
+        idx = File.join(projects_root, project, "INDEX.md")
+        texts["project:#{project}"] = File.read(idx) if File.exist?(idx)
+      end
+    end
+    texts
+  end
+
   # Build a per-scope `nodes` map and surface IntentValidator.validate_graph
   # findings as warn-level checks. Scope-aware (the caller already filtered
   # `intent_dirs` by scope), so a `global` id is not falsely flagged as a dangler

package/scripts/lib/bridge.rb

@@ -58,11 +58,20 @@ module Bridge
   end
 
   # Resolve a bridge session: first non-empty of explicit, CLAUDE_SESSION_ID,
-  # then a derived key. Never returns nil/empty. Whitespace-only counts as empty.
+  # CLAUDE_CODE_SESSION_ID, then a derived key. Never returns nil/empty.
+  # Whitespace-only counts as empty.
+  #
+  # The CLAUDE_CODE_SESSION_ID fallback (intent 79) is additive: it only changes
+  # behavior when CLAUDE_SESSION_ID is blank but CLAUDE_CODE_SESSION_ID is set —
+  # the bg/headless case where the real session id lives in CLAUDE_CODE_SESSION_ID.
+  # Keying by the real id (instead of a derived hash) lets the statusline, which
+  # receives that same id on stdin, find the bridge by direct filename lookup.
   def self.resolve_session(explicit, intent_id:, store:)
     return explicit.to_s.strip unless blank?(explicit)
     env = ENV["CLAUDE_SESSION_ID"]
     return env.to_s.strip unless blank?(env)
+    code_env = ENV["CLAUDE_CODE_SESSION_ID"]
+    return code_env.to_s.strip unless blank?(code_env)
     derive_key(store, intent_id)
   end
 
@@ -386,7 +395,7 @@ module Bridge
   # (mid-session intent creation). Re-derives intent state, then sets build.auto.
   def self.arm_auto(session, intent_id:, intent_dir:, store:, name:)
     key = resolve_session(session, intent_id: intent_id, store: store)
-    if blank?(session) && blank?(ENV["CLAUDE_SESSION_ID"])
+    if blank?(session) && blank?(ENV["CLAUDE_SESSION_ID"]) && blank?(ENV["CLAUDE_CODE_SESSION_ID"])
       $stderr.puts "plastic: no session id available; arming auto with derived bridge key #{key}"
     end
     data = derive(key, intent_id: intent_id, intent_dir: intent_dir, store: store, name: name)

package/scripts/lib/frontmatter_writer.rb

@@ -0,0 +1,130 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+# FrontmatterWriter — pure, minimal, style-preserving rewrite of the `sources:`
+# and `chain:` arrays in an intent file's content string (intent 49).
+#
+# It rewrites ONLY those two arrays and leaves every other frontmatter line and
+# the entire body byte-identical. It preserves each array's existing serialization
+# style independently:
+#   - flow style: `sources: ["40", "1a"]`  (or `[]`)
+#   - block style: a `sources:` line followed by `  - '1a'` item lines
+# When the desired array equals the file's current value (same ids, same order),
+# the content is returned UNCHANGED so a re-run produces no diff (idempotency).
+#
+# Pure: no file IO, no eval, no global/ENV state. The IO shell reads/writes files.
+module FrontmatterWriter
+  module_function
+
+  # Rewrite `sources:`/`chain:` in `content`. `sources`/`chain` are the desired
+  # final arrays of id strings. Returns the new content (or the original when
+  # nothing changed). Only operates within the leading `---`...`---` frontmatter
+  # block; never touches the body.
+  def rewrite_arrays(content, sources:, chain:)
+    return content unless content.is_a?(String) && content.start_with?("---")
+
+    parts = content.split("---", 3)
+    return content if parts.length < 3
+
+    fm = parts[1]
+    body = parts[2]
+
+    fm = rewrite_one(fm, "sources", sources)
+    fm = rewrite_one(fm, "chain", chain)
+
+    "---#{fm}---#{body}"
+  end
+
+  # Rewrite a single `key:` array within the frontmatter text `fm`, preserving the
+  # key's existing flow-vs-block style. No-op when the key is absent or unchanged.
+  def rewrite_one(fm, key, desired)
+    lines = fm.lines
+    idx = lines.index { |l| l.match?(/\A#{Regexp.escape(key)}:\s/) || l.match?(/\A#{Regexp.escape(key)}:\s*\z/) }
+    return fm if idx.nil?
+
+    header = lines[idx]
+    if block_style?(lines, idx)
+      rewrite_block(lines, idx, key, desired)
+    else
+      rewrite_flow(lines, idx, header, key, desired)
+    end
+  end
+
+  # The key is block style when its own line carries no inline value and the next
+  # non-blank line is a `-` list item.
+  def block_style?(lines, idx)
+    header = lines[idx]
+    inline = header.sub(/\A[^:]+:/, "").strip
+    return false unless inline.empty?
+
+    nxt = lines[idx + 1]
+    !nxt.nil? && nxt.match?(/\A\s*-\s/)
+  end
+
+  # Flow style: replace the inline array on the header line, preserving indentation
+  # and any trailing newline. No-op when the current ids already match `desired`.
+  def rewrite_flow(lines, idx, header, key, desired)
+    current = parse_flow(header)
+    return lines.join if current == desired
+
+    newline = header.end_with?("\n") ? "\n" : ""
+    lines[idx] = "#{key}: #{render_flow(desired)}#{newline}"
+    lines.join
+  end
+
+  # Parse the inline flow array from a `key: [ ... ]` header line.
+  def parse_flow(header)
+    inline = header.sub(/\A[^:]+:/, "").strip
+    return [] if inline.empty? || inline == "[]"
+
+    inline = inline.sub(/\A\[/, "").sub(/\]\z/, "")
+    inline.split(",").map { |t| t.strip.gsub(/\A['"]|['"]\z/, "") }.reject(&:empty?)
+  end
+
+  def render_flow(ids)
+    return "[]" if ids.empty?
+
+    "[#{ids.map { |i| "\"#{i}\"" }.join(", ")}]"
+  end
+
+  # Block style: replace the contiguous `-` item lines following the header. No-op
+  # when the current ids already match `desired`. Preserves the item indentation
+  # and quoting style sampled from the existing first item.
+  def rewrite_block(lines, idx, key, desired)
+    last = idx
+    item_lines = []
+    (idx + 1).upto(lines.length - 1) do |i|
+      break unless lines[i].match?(/\A\s*-\s/)
+
+      item_lines << lines[i]
+      last = i
+    end
+
+    current = item_lines.map { |l| l.sub(/\A\s*-\s*/, "").strip.gsub(/\A['"]|['"]\z/, "") }
+    return lines.join if current == desired
+
+    indent, quote = block_item_shape(item_lines.first)
+    rendered = desired.map { |id| "#{indent}- #{quote}#{id}#{quote}\n" }
+
+    # When desired is empty, collapse the block to an inline `key: []` to keep YAML
+    # valid (a bare `key:` with no items parses as nil, not an empty array).
+    rendered = ["#{key}: []\n"] if desired.empty? && rendered.empty?
+
+    if desired.empty?
+      new_lines = lines[0...idx] + rendered + lines[(last + 1)..]
+    else
+      new_lines = lines[0...idx] + [lines[idx]] + rendered + lines[(last + 1)..]
+    end
+    new_lines.join
+  end
+
+  # Sample indentation and quote char from an existing block item line.
+  def block_item_shape(sample)
+    return ["", "'"] if sample.nil?
+
+    indent = sample[/\A\s*/].to_s
+    value = sample.sub(/\A\s*-\s*/, "").strip
+    quote = value.start_with?('"') ? '"' : "'"
+    [indent, quote]
+  end
+end