@zalom/plastic 2.0.0-alpha.26 → 2.0.0-alpha.28

package/scripts/doctor.rb

@@ -9,6 +9,7 @@
 # Exit codes: 0 (all pass), 1 (warnings only), 2 (failures present)
 # Read-only — never modifies files.
 
+require_relative "lib/store_layout"
 require "date"
 require "open3"
 require "timeout"
@@ -40,6 +41,7 @@ require_relative "lib/preflight"
 require_relative "lib/ruby_probe"
 require_relative "lib/doctor_session_ledger"
 require_relative "lib/intent_screen"
+require_relative "lib/store_sync"
 
 # Diagnostic engine, instantiable with an injected store/agent map so tests can
 # run it hermetically (no eval, no global-constant rewriting).
@@ -216,7 +218,7 @@ class Doctor
   def check_global_store
     checks = []
 
-    index_path = File.join(plastic_home, "INDEX.md")
+    index_path = File.join(Plastic::StoreLayout.global_root(plastic_home), "INDEX.md")
 
     # index_exists
     if File.exist?(index_path)
@@ -252,7 +254,7 @@ class Doctor
     end
 
     # orphaned_intents — directories in store/ not referenced in INDEX.md
-    store_dir = File.join(plastic_home, "store")
+    store_dir = Plastic::StoreLayout.global_store(plastic_home)
     if File.directory?(store_dir)
       intent_dirs = store_intent_dirs(store_dir)
       orphans = intent_dirs.reject { |d| content.include?("store/#{d}") }
@@ -278,7 +280,7 @@ class Doctor
     store_paths = content.scan(%r{store/\S+}).map { |ref| ref.gsub(/[)\]>].*/, "").chomp("/") }.uniq
 
     ghosts = store_paths.select do |ref|
-      full_path = File.join(plastic_home, ref)
+      full_path = File.join(Plastic::StoreLayout.global_root(plastic_home), ref)
       !File.exist?(full_path) && !File.directory?(full_path)
     end
 
@@ -330,7 +332,7 @@ class Doctor
           category: "core_files", name: name, status: "warn",
           message: "#{config[:name]}'s agent-side VERSION file not found at #{tilde(agent_version_path)}",
           fixable: true,
-          fix_hint: "Re-sync the stale harness: npx @zalom/plastic@latest install --reinstall <flag>, or plastic-rollback to a prior version"
+          fix_hint: "Re-sync the stale harness: npx @zalom/plastic@latest install --reinstall <flag>, or `plastic rollback` to a prior version"
         )
       else
         agent_version = File.read(agent_version_path).strip
@@ -348,7 +350,7 @@ class Doctor
               "#{tilde(agent_version_path)}: #{agent_version}",
             ],
             fixable: true,
-            fix_hint: "Re-sync the stale harness: npx @zalom/plastic@latest install --reinstall <flag>, or plastic-rollback to a prior version"
+            fix_hint: "Re-sync the stale harness: npx @zalom/plastic@latest install --reinstall <flag>, or `plastic rollback` to a prior version"
           )
         end
       end
@@ -613,7 +615,7 @@ class Doctor
         fixable: true,
         fix_hint: "Relocate each unsanctioned section into the " \
                   "intent's revisions.md via move-and-record (a missing required section is restored " \
-                  "or reprojected instead); see plastic-conventions > references/maintenance-and-revisions.md"
+                  "or reprojected instead); see `plastic help maintenance-and-revisions`"
       )
     end
 
@@ -644,7 +646,7 @@ class Doctor
     # unpromoted_rules (intent 341, G8, C37): an Insights entry tagged
     # `rule:` (via `insight-append --rule`) is a promise the rule will make
     # it into project doctrine. Advisory only.
-    checks.concat(unpromoted_rules_checks(intent_dirs, home: Dir.home))
+    checks.concat(unpromoted_rules_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
@@ -705,14 +707,14 @@ class Doctor
     if scopes.nil? || scopes.include?("global")
       stores << {
         scope: "global",
-        index: File.join(plastic_home, "INDEX.md"),
-        store_dir: File.join(plastic_home, "store"),
+        index: File.join(Plastic::StoreLayout.global_root(plastic_home), "INDEX.md"),
+        store_dir: Plastic::StoreLayout.global_store(plastic_home),
       }
     end
 
-    projects_root = File.join(plastic_home, "projects")
+    projects_root = Plastic::StoreLayout.projects_root(plastic_home)
     if File.directory?(projects_root)
-      Dir.children(projects_root).sort.each do |project|
+      Plastic::StoreLayout.project_slugs(plastic_home).each do |project|
         scope = "project:#{project}"
         next unless scopes.nil? || scopes.include?(scope)
 
@@ -1228,7 +1230,7 @@ end
       "project-links --intent <id> --apply` over running project-links directly: it detects " \
       "(never acquires) the target's delivery lock, requires a clean store working tree, and " \
       "commits the scoped change plus its revisions.md receipt as one merged operation " \
-      "(plastic-conventions > references/maintenance-and-revisions.md)."
+      "(`plastic help maintenance-and-revisions`)."
     )
   end
 
@@ -1692,7 +1694,7 @@ end
       "Every sources/chain id resolves to a real intent (I4)",
       "Record the dangling sources/chain edge as a " \
       "broken-source/broken-chain move-and-record entry in the intent's revisions.md (see " \
-      "plastic-conventions > references/maintenance-and-revisions.md), or restore the missing intent"
+      "`plastic help maintenance-and-revisions`), or restore the missing intent"
     )
     checks
   end
@@ -1865,31 +1867,25 @@ end
   #
   # `insight-append --rule` tags an entry "... - rule: <text>". A tag is a
   # promise the rule will make it into project doctrine; until the exact
-  # rule text shows up in some skills/conventions/references/*.md chapter,
-  # it is only visible to a session that happens to read this one intent
-  # file, and the next session repeats the mistake the rule names. Advisory
-  # only (warn, never fail): a freshly tagged rule is not yet promoted by
-  # design, and nothing here can auto-promote it (that is an editorial call,
-  # not a mechanical one).
+  # rule text shows up in some docs/help/*.md chapter, it is only visible to
+  # a session that happens to read this one intent file, and the next
+  # session repeats the mistake the rule names. Advisory only (warn, never
+  # fail): a freshly tagged rule is not yet promoted by design, and nothing
+  # here can auto-promote it (that is an editorial call, not a mechanical
+  # one).
   RULE_ENTRY_RE = /—\s*rule:\s*(.+?)\s*\z/.freeze
 
-  def unpromoted_rules_checks(intent_dirs, package_root: PACKAGE_ROOT, home: nil)
-    # The installed doctor runs from ~/.plastic/scripts, so PACKAGE_ROOT
-    # (~/.plastic) has no skills/ directory: the conventions chapters install
-    # to the agent home layout instead. `home` is caller-injected (never an
-    # ENV read here) so this stays hermetic in tests; the real call site
-    # passes the process's actual home directory.
-    chapter_dirs = []
-    if home
-      chapter_dirs << File.join(home, ".claude", "skills", "plastic-conventions", "references")
-      chapter_dirs << File.join(home, ".agents", "skills", "plastic-conventions", "references")
-    end
-    chapter_dirs << File.join(package_root, "skills", "conventions", "references")
+  def unpromoted_rules_checks(intent_dirs, package_root: PACKAGE_ROOT)
+    # docs/help installs straight under PACKAGE_ROOT for every harness alike
+    # (~/.plastic/docs/help once installed, repo docs/help in a checkout), so
+    # a single path covers both the repo and the installed layout; unlike
+    # the old skills-based chapters, help topics are no longer agent-home
+    # specific, so this needs no `home:` split.
+    chapter_dir = File.join(package_root, "docs", "help")
 
-    chapters_text = chapter_dirs.select { |d| Dir.exist?(d) }
-                                .flat_map { |d| Dir.glob(File.join(d, "*.md")) }
-                                .map { |f| File.read(f) }
-                                .join("\n\n")
+    chapters_text = Dir.glob(File.join(chapter_dir, "*.md"))
+                        .map { |f| File.read(f) }
+                        .join("\n\n")
 
     unpromoted = []
     intent_dirs.each do |d|
@@ -1917,7 +1913,7 @@ end
         category: "conventions", name: "unpromoted_rules", status: "warn",
         message: "#{unpromoted.size} tagged rule(s) not yet carried by any conventions chapter",
         details: unpromoted, fixable: false,
-        fix_hint: "Promote the rule into the right skills/conventions/references/*.md chapter, " \
+        fix_hint: "Promote the rule into the right docs/help/*.md chapter, " \
                   "or drop the tag if the finding does not belong in doctrine"
       )]
     end
@@ -1934,8 +1930,7 @@ end
   # skill directory under agent_dir/skills that has NO corresponding entry in the
   # current install manifest is a stray (e.g. a leftover old-name copy the
   # install/update prune should have removed, or one it never saw because the
-  # manifest predates it). Complements flat_skills_check (which only confirms at
-  # least one skill exists). Defers to the manifest check when the manifest itself
+  # manifest predates it). Defers to the manifest check when the manifest itself
   # is missing or malformed, so the two checks never double-report the same gap.
 
   # Auto-mode role agents install as <dir>/agents/plastic-*.md. Pass if at least
@@ -2159,6 +2154,8 @@ end
 
     global_config = load_yaml_safe(File.join(plastic_home, "config.yml")) || {}
     overrides = AgentModels.override_map(project_config: {}, global_config: global_config, harness: "codex")
+    effort_overrides = AgentModels.effort_override_map(project_config: {}, global_config: global_config,
+                                                        harness: "codex")
 
     drifted = []
     sanctioned = []
@@ -2169,13 +2166,13 @@ end
       fields = codex_agent_toml_model_fields(File.read(path))
       override = overrides[basename]
 
-      if override
+      if override || effort_overrides[basename]
         sanctioned << "#{basename}: toml model=#{fields[:model].inspect}, " \
-                      "toml effort=#{fields[:effort].inspect}, sanctioned override=#{override.inspect}"
-      elsif AgentModels::TIER_DEFAULTS.key?(basename)
-        tier = AgentModels::TIER_DEFAULTS[basename]
-        expected_model = AgentModels.codex_model_for(tier)
-        expected_effort = AgentModels.effort_for(tier)
+                      "toml effort=#{fields[:effort].inspect}, sanctioned model override=#{override.inspect}, " \
+                      "effort override=#{effort_overrides[basename].inspect}"
+      elsif AgentModels::SHIPPED_MODEL_DEFAULTS.key?(basename)
+        expected_model = AgentModels.shipped_model_for(basename, harness: "codex")
+        expected_effort = AgentModels.shipped_effort_for(basename)
         mismatches = []
         if expected_model && fields[:model] != expected_model
           mismatches << "model=#{fields[:model].inspect}, resolved default model=#{expected_model.inspect}"
@@ -2187,7 +2184,7 @@ end
       else
         unclassified << "#{basename}: toml model=#{fields[:model].inspect}, " \
                         "toml effort=#{fields[:effort].inspect}, no resolved default (basename is in " \
-                        "neither AgentModels::TIER_DEFAULTS nor AgentModels::CONSULTATION_AGENTS in " \
+                        "AgentModels::SHIPPED_MODEL_DEFAULTS in " \
                         "scripts/lib/agent_models.rb; add it there, or set agents.models.codex.#{basename} " \
                         "to sanction a model explicitly)"
       end
@@ -2299,7 +2296,7 @@ end
   # project can be checked in isolation (used by `--store <slug>`).
   def check_project_store(slug, project_info)
     checks = []
-    project_dir = File.join(plastic_home, "projects", slug)
+    project_dir = Plastic::StoreLayout.project_root(plastic_home, slug)
 
     # project_dir_exists
     if File.directory?(project_dir)
@@ -2349,7 +2346,7 @@ end
     end
 
     # project_yml_exists
-    project_yml_path = File.join(plastic_home, "projects", slug, "project.yml")
+    project_yml_path = File.join(Plastic::StoreLayout.project_root(plastic_home, slug), "project.yml")
     project_yml_data = nil
 
     if File.exist?(project_yml_path)
@@ -2396,7 +2393,7 @@ end
     return checks unless parent_id
 
     # Find the intent directory for the parent ID
-    store_dir = File.join(plastic_home, "store")
+    store_dir = Plastic::StoreLayout.global_store(plastic_home)
     parent_dir = nil
     if File.directory?(store_dir)
       parent_dir = Dir.children(store_dir).find { |d| d.start_with?("#{parent_id}--") }
@@ -2553,7 +2550,7 @@ end
   # A config-asks warn in that tier would flip every post-update doctor to
   # "fail" on an otherwise healthy install until the question is answered,
   # re-noising the post-update surface intent 126 deliberately quieted. The
-  # recoverable-later path for a pending question is a full `/plastic-doctor`
+  # recoverable-later path for a pending question is a full `plastic doctor`
   # run, the declared maintenance front door; the moment-it-happens path is
   # update.rb#announce_pending_config_asks, which already runs on every hop.
   #
@@ -3017,6 +3014,16 @@ end
     end
   end
 
+  def check_graph_links
+    return [] unless File.exist?(Plastic::WorkGraph.path(plastic_home))
+
+    orphans = Plastic::StoreSync.orphans(plastic_home)
+    return [check(category: "graph_links", name: "graph_links", status: "pass", message: "every stored file belongs to an intent in work_graph.db")] if orphans.empty?
+
+    [check(category: "graph_links", name: "graph_links", status: "warn", details: orphans, fixable: false,
+      message: "#{orphans.size} intent id(s) hold files and have no row in work_graph.db")]
+  end
+
   # --- Run all checks ---
 
   def run_checks(agent_key)
@@ -3035,6 +3042,7 @@ end
     all_checks += check_session_ledger(scopes: ["global"])
     all_checks += check_skill_lint
     all_checks += check_install_integrity
+    all_checks += check_graph_links
     all_checks += check_display_registration(agent_key)
     all_checks += check_display_paints(agent_key)
     all_checks += check_display_not_defeated(agent_key)

package/scripts/end-intent

@@ -68,6 +68,7 @@
 #   7  hollow delivered report refused (317a D7) - intent 308's one deliberate
 #      exception to report-and-proceed; --allow-hollow-report overrides.
 
+require_relative "lib/store_layout"
 require "fileutils"
 require "date"
 require "open3"
@@ -170,14 +171,7 @@ end
 # "projects" (the StoreDiscovery convention, scripts/lib/store_discovery.rb), never by
 # hardcoding ".plastic" as a name.
 def resolve_plastic_home_and_scope(store)
-  parent = File.dirname(store)
-  grandparent = File.dirname(parent)
-  if File.basename(grandparent) == "projects"
-    slug = File.basename(parent)
-    [File.dirname(grandparent), "project:#{slug}"]
-  else
-    [parent, "global"]
-  end
+  Plastic::StoreLayout.home_and_scope(store)
 end
 
 # --- outcome generation, before the backfill (intent 339, G6, spec D10) -----

package/scripts/file-session-intent

@@ -14,6 +14,7 @@
 # and on any filing error (reported on stderr; the next boot tries again), 2 on
 # a usage error.
 
+require_relative "lib/store_layout"
 require_relative "lib/session_ledger"
 require_relative "lib/session_backfill"
 
@@ -48,7 +49,7 @@ if opts[:carry_to] && !SessionLedger.valid_day_id?(opts[:carry_to])
   usage_abort("--carry-to must be a real calendar date, YYYYMMDD")
 end
 
-store = opts[:store] || File.join(File.expand_path(ENV.fetch("PLASTIC_HOME", "~/.plastic")), "store")
+store = opts[:store] || Plastic::StoreLayout.global_store(File.expand_path(ENV.fetch("PLASTIC_HOME", "~/.plastic")))
 templates = opts[:templates] || File.expand_path("../templates", __dir__)
 
 begin

package/scripts/hook-capture

@@ -9,6 +9,7 @@
 # runs in its own rescue and the hook always exits 0 (spec D2). Intent 345
 # (D7, 323) removed the per-prompt Future-intent hint step entirely.
 
+require_relative "lib/store_layout"
 require "json"
 require "open3"
 require "time"
@@ -38,7 +39,7 @@ cwd = payload["cwd"].to_s
 cwd = Dir.pwd if cwd.empty?
 
 plastic_home = File.expand_path(ENV["PLASTIC_HOME"] || "~/.plastic")
-store = File.join(plastic_home, "store")
+store = Plastic::StoreLayout.global_store(plastic_home)
 templates = File.expand_path("../templates", __dir__)
 sid = SessionLedger.short_session_id(nil, session_id)
 today = SessionLedger.day_id
@@ -108,7 +109,7 @@ begin
       cockpit, _err, status = Open3.capture3({ "RUBYOPT" => nil }, "ruby", dashboard, "continue")
       if status.success? && !cockpit.strip.empty?
         context_parts << (cockpit.rstrip +
-          "\n\nFollow the plastic-intent-continuing skill workflow to resume: " \
+          "\n\nRun `plastic continue` to resume: " \
           "if active intents exist, read their state and resume; otherwise surface the " \
           "most-valuable next work and any stale or triage intents from the board above.")
 
@@ -135,7 +136,7 @@ begin
   auto_triggers = ["take it from here", "deliver this", "/plastic-auto", "auto mode"].freeze
   triggered = auto_triggers.any? { |p| message_lower.include?(p) } || message_lower.match?(/\bauto\b/)
   if triggered
-    context_parts << "Auto-mode request detected. Invoke the plastic-auto skill to deliver the " \
+    context_parts << "Auto-mode request detected. Run `plastic auto take ID` to deliver the " \
                       "active intent autonomously - it takes the intent under a lock and a worktree " \
                       "and points this session at it."
   end

package/scripts/hook-close

@@ -8,6 +8,7 @@
 #
 # Usage: hook-close <plastic_home>   (stdin: the hook JSON)
 
+require_relative "lib/store_layout"
 require "json"
 require_relative "lib/session_ledger"
 require_relative "lib/session_close"
@@ -23,7 +24,7 @@ payload =
     {}
   end
 
-store = File.join(File.expand_path(plastic_home), "store")
+store = Plastic::StoreLayout.global_store(File.expand_path(plastic_home))
 filer = File.expand_path("file-session-intent", __dir__)
 templates = File.expand_path("../templates", __dir__)
 begin

package/scripts/hook-record

@@ -10,6 +10,7 @@
 # lands, and calls the session-commit seam when that script exists. Always
 # exits 0 (spec D3).
 
+require_relative "lib/store_layout"
 require "json"
 require "timeout"
 require "fileutils"
@@ -77,7 +78,7 @@ skip_day_ledger = inside_plastic || !intent_dir_abs.nil?
 # --- (c) promote the newest pending line, Item savepoint, seam -------------
 unless skip_day_ledger
   begin
-    store = File.join(plastic_home, "store")
+    store = Plastic::StoreLayout.global_store(plastic_home)
     sid = SessionLedger.short_session_id(nil, session_id)
     today = SessionLedger.day_id
 
@@ -152,7 +153,7 @@ end
 # the heartbeat is not written and no directory is created here either --
 # the session tmp directory, created by session start, is the guard.
 begin
-  store ||= File.join(plastic_home, "store")
+  store ||= Plastic::StoreLayout.global_store(plastic_home)
   sid ||= SessionLedger.short_session_id(nil, session_id)
   if Dir.exist?(SessionLedger.session_tmp_dir(store, sid))
     File.write(SessionLedger.heartbeat_path(store, sid), "#{Time.now.utc.iso8601}\n")

package/scripts/hook-savepoint

@@ -13,6 +13,7 @@
 #
 # Usage: hook-savepoint <plastic_home>   (stdin: the hook JSON)
 
+require_relative "lib/store_layout"
 require "json"
 require_relative "lib/session_ledger"
 require_relative "lib/handoff"
@@ -31,7 +32,7 @@ MESSAGE = "PLASTIC SAVEPOINT - context is being compacted. The hand-off for this
 def resolve_intent(plastic_home, session_id, read_config_path)
   return nil if session_id.strip.empty?
 
-  global_store = File.join(plastic_home, "store")
+  global_store = Plastic::StoreLayout.global_store(plastic_home)
   roots_raw = IO.popen({ "PLASTIC_HOME" => plastic_home }, [read_config_path, "project_roots"],
                        err: File::NULL, &:read).to_s.strip
   project_roots = roots_raw.empty? ? [] : Array(JSON.parse(roots_raw))
@@ -51,7 +52,7 @@ begin
 
   unless plastic_home.empty? || session_id.strip.empty?
     home = File.expand_path(plastic_home)
-    store = File.join(home, "store")
+    store = Plastic::StoreLayout.global_store(home)
     session = SessionLedger.short_session_id(session_id, nil)
     day = Handoff.day_for(store, session, today: SessionLedger.day_id)
     read_config_path = File.expand_path("read-config", __dir__)

package/scripts/hook-session-start

@@ -3,6 +3,7 @@
 # Usage: hook-session-start <index_path> <plastic_home> <mode> [plugin_root]
 # Outputs hook JSON for the session-start hook. Exits silently if nothing to show.
 
+require_relative "lib/store_layout"
 require "json"
 require "date"
 require "yaml"
@@ -58,7 +59,7 @@ end
 # home (~/.plastic) as argument 2; the store lives one level below it. Compose the
 # store exactly once here, so no later line re-derives it and no path can gain a
 # doubled store/ segment.
-store_dir = File.join(plastic_home, "store")
+store_dir = Plastic::StoreLayout.global_store(plastic_home)
 
 # --- Current version ---
 # Read early, before any of the richer INDEX/project parsing below, so the
@@ -154,7 +155,7 @@ begin
       project_path = File.expand_path(info["path"])
       if cwd.start_with?(project_path)
         current_project = { "slug" => slug, "parent" => info["parent"], "path" => project_path }
-        project_index = "#{plastic_home}/projects/#{slug}/INDEX.md"
+        project_index = File.join(Plastic::StoreLayout.project_root(plastic_home, slug), "INDEX.md")
         if File.exist?(project_index)
           p_section = nil
           File.readlines(project_index).each do |pline|
@@ -220,7 +221,7 @@ begin
   if File.exist?(cache_file)
     cache = JSON.parse(File.read(cache_file)) rescue {}
     if cache["updateAvailable"]
-      update_notice = "Plastic update available: #{cache["current"]} -> #{cache["latest"]} — run /plastic-update"
+      update_notice = "Plastic update available: #{cache["current"]} -> #{cache["latest"]} — run `plastic update`"
     end
   end
 
@@ -291,7 +292,7 @@ begin
   if plastic_md && !subagent_session
     if current_project
       slug = current_project["slug"]
-      banner = "Project: #{slug} | Store: ~/.plastic/projects/#{slug}/store/"
+      banner = "Project: #{slug} | Store: #{File.join(Plastic::StoreLayout.project_root(plastic_home, slug), "store").sub(Dir.home, "~")}/"
       if project_active.any? && project_active.first =~ /\[([^\]]+)\].*store\/([\w-]+)\//
         intent_name, dir_name = $1, $2
         intent_id = dir_name.split("--").first

package/scripts/hook-stop

@@ -14,6 +14,7 @@
 #
 # Usage: hook-stop <plastic_home>   (stdin: the hook JSON)
 
+require_relative "lib/store_layout"
 require "json"
 require_relative "lib/stop_gate"
 
@@ -32,7 +33,7 @@ begin
   payload = {} unless payload.is_a?(Hash)
 
   home = File.expand_path(plastic_home)
-  global_store = File.join(home, "store")
+  global_store = Plastic::StoreLayout.global_store(home)
   read_config = File.expand_path("read-config", __dir__)
 
   config_stop_hook = read_config_value("runner.stop_hook", home, read_config)

package/scripts/insight-append

@@ -16,8 +16,7 @@
 # ever reaches Insights.append_insight; the library itself stays untouched,
 # since a tag is a text-level convention, not a new field on the ledger.
 # Doctor's unpromoted_rules check (scripts/doctor.rb) later lists any tagged
-# entry whose exact text no skills/conventions/references/*.md chapter
-# carries yet.
+# entry whose exact text no docs/help/*.md chapter carries yet.
 #
 # Usage:
 #   insight-append <intent_dir> <text> --stage S --author A [--rule]

package/scripts/install.rb

@@ -75,12 +75,15 @@ class Install < InstallerCore
   # they are reported, never re-installed, so the summary line and the Codex
   # trust reminder only ever count agents that actually changed this run.
   def run(selected:, force: false, reinstall: false, ledger_action: nil, argv: ARGV, input: $stdin,
-          already_registered: [])
+          already_registered: [], qmd_runner: QmdSync.default_runner, qmd_detector: QmdSync.method(:detect))
     fresh = !installed?
     mode = fresh ? :install : :update # :update here means "re-sync, skip bootstrap"
 
     distribute(mode)
     bootstrap if fresh
+    git_init_if_absent
+    register_with_qmd(runner: qmd_runner, detector: qmd_detector)
+    migrate_advisor_config_file(File.join(plastic_home, "config.yml"))
     apply_config_flags(argv)
 
     results = selected.map do |key|
@@ -239,10 +242,9 @@ class Install < InstallerCore
         --no-advisor         Skip installing both advisor agents and the agent-advisor
                              skill (advisor.enabled: false)
         --advisor VALUE      Which advisor agent is the default: an agent name, or the
-                             shorthand "real" (plastic-advisor) or "faux"
-                             (plastic-faux-advisor). Writes advisor.claude.default. Left
-                             unset, the agent-advisor skill falls back to
-                             plastic-faux-advisor at consult time.
+                             shorthand "primary" or "secondary". Legacy "real" and
+                             "faux" aliases remain accepted. Writes advisor.claude.default.
+                             Left unset, the agent-advisor skill falls back to Primary Advisor.
         -h, --help           Show this help
 
       Notes:

package/scripts/lib/action_graph_shim.rb

@@ -83,7 +83,7 @@ module ActionGraphShim
   end
 
   # Node records for either shape (D8), always carrying NodeFile.parse's own
-  # key set (ok:, node:, kind:, files:, budget:, body:, errors:) plus
+  # key set (ok:, node:, kind:, files:, budget:, report:, body:, errors:) plus
   # needs:, path: and proven_by:. [] on :none, never a raise on a real
   # directory.
   def nodes(intent_dir)
@@ -153,6 +153,7 @@ module ActionGraphShim
           kind: "work",
           files: files_section_paths(text),
           budget: nil,
+          report: nil,
           body: text,
           errors: [],
           needs: needs_targets,
@@ -166,6 +167,7 @@ module ActionGraphShim
           kind: "work",
           files: [],
           budget: nil,
+          report: nil,
           body: nil,
           errors: ["could not read #{path}: #{e.message}"],
           needs: needs_targets,

package/scripts/lib/active_delivery.rb

@@ -60,7 +60,7 @@ module ActiveDelivery
     value.nil? || value.to_s.strip.empty?
   end
 
-  DEFAULT_PROJECT_ROOTS = ["~/.plastic/projects"].freeze
+  DEFAULT_PROJECT_ROOTS = ["~/.plastic/projects", "~/.plastic/stores"].freeze
 
   # The configured project roots (344 n2, D6): the `project_roots` list in
   # `<plastic_home>/config.yml`, each expanded, or the default