@zalom/plastic 1.0.0-alpha.15 → 1.0.0-alpha.17

package/scripts/doctor.rb

@@ -12,6 +12,7 @@
 require "json"
 require "yaml"
 require "time"
+require "date"
 
 PLASTIC_HOME = File.join(Dir.home, ".plastic")
 
@@ -150,21 +151,31 @@ def parse_frontmatter(path)
   parts = content.split("---", 3)
   return nil if parts.length < 3
 
-  YAML.safe_load(parts[1]) || {}
+  # created: dates parse as Date objects, which safe_load rejects by default —
+  # permit Date/Time so valid frontmatter isn't misreported as missing.
+  YAML.safe_load(parts[1], permitted_classes: [Date, Time]) || {}
 rescue
   nil
 end
 
 # --- Collect all intent directories (global + project stores) ---
 
+# Child directories of a store, excluding dotfiles/dot-directories
+# (e.g. .obsidian, .git) which are tooling artifacts, not intents.
+def store_intent_dirs(store)
+  Dir.children(store).reject { |e| e.start_with?(".") }.select do |e|
+    File.directory?(File.join(store, e))
+  end
+end
+
 def all_intent_dirs
   dirs = []
 
   global_store = File.join(PLASTIC_HOME, "store")
   if File.directory?(global_store)
-    Dir.children(global_store).each do |entry|
+    store_intent_dirs(global_store).each do |entry|
       full = File.join(global_store, entry)
-      dirs << { path: full, name: entry, scope: "global" } if File.directory?(full)
+      dirs << { path: full, name: entry, scope: "global" }
     end
   end
 
@@ -174,9 +185,9 @@ def all_intent_dirs
       project_store = File.join(projects_root, project, "store")
       next unless File.directory?(project_store)
 
-      Dir.children(project_store).each do |entry|
+      store_intent_dirs(project_store).each do |entry|
         full = File.join(project_store, entry)
-        dirs << { path: full, name: entry, scope: "project:#{project}" } if File.directory?(full)
+        dirs << { path: full, name: entry, scope: "project:#{project}" }
       end
     end
   end
@@ -227,7 +238,7 @@ def check_global_store
   # orphaned_intents — directories in store/ not referenced in INDEX.md
   store_dir = File.join(PLASTIC_HOME, "store")
   if File.directory?(store_dir)
-    intent_dirs = Dir.children(store_dir).select { |e| File.directory?(File.join(store_dir, e)) }
+    intent_dirs = store_intent_dirs(store_dir)
     orphans = intent_dirs.reject { |d| content.include?("store/#{d}") }
 
     if orphans.empty?
@@ -459,22 +470,30 @@ def check_claude_registration(agent_dir)
     end
   end
 
-  # skills_exist
-  skills_dir = File.join(agent_dir, "skills", "plastic")
-  if File.directory?(skills_dir) && !Dir.empty?(skills_dir)
-    checks << check(
+  # skills_exist — flat, hyphen-namespaced personal skills (plastic-<name>/)
+  checks << flat_skills_check(agent_dir, "--claude")
+
+  checks
+end
+
+# Plastic skills install as ~/.claude/skills/plastic-<name>/SKILL.md. Pass if at
+# least one such skill is present.
+def flat_skills_check(agent_dir, installer_flag)
+  skills_root = File.join(agent_dir, "skills")
+  found = Dir.glob(File.join(skills_root, "plastic-*", "SKILL.md"))
+
+  if !found.empty?
+    check(
       category: "agent_registration", name: "skills_exist", status: "pass",
-      message: "Skills directory exists at #{tilde(skills_dir)}"
+      message: "#{found.size} plastic-* skill(s) installed in #{tilde(skills_root)}"
     )
   else
-    checks << check(
+    check(
       category: "agent_registration", name: "skills_exist", status: "fail",
-      message: "Skills directory missing or empty at #{tilde(skills_dir)}",
-      fixable: true, fix_hint: "Re-run the Plastic installer: npx @zalom/plastic@latest --claude"
+      message: "No plastic-* skills found in #{tilde(skills_root)}",
+      fixable: true, fix_hint: "Re-run the Plastic installer: npx @zalom/plastic@latest #{installer_flag}"
     )
   end
-
-  checks
 end
 
 def check_generic_agent_registration(agent_key, agent_dir)
@@ -482,19 +501,7 @@ def check_generic_agent_registration(agent_key, agent_dir)
   config = AGENTS[agent_key]
 
   # For codex/hermes: just check skills exist (no settings.json hooks)
-  skills_dir = File.join(agent_dir, "skills", "plastic")
-  if File.directory?(skills_dir) && !Dir.empty?(skills_dir)
-    checks << check(
-      category: "agent_registration", name: "skills_exist", status: "pass",
-      message: "Skills directory exists at #{tilde(skills_dir)}"
-    )
-  else
-    checks << check(
-      category: "agent_registration", name: "skills_exist", status: "fail",
-      message: "Skills directory missing or empty at #{tilde(skills_dir)}",
-      fixable: true, fix_hint: "Re-run the Plastic installer: npx @zalom/plastic@latest --#{agent_key}"
-    )
-  end
+  checks << flat_skills_check(agent_dir, "--#{agent_key}")
 
   checks
 end
@@ -695,7 +702,7 @@ def check_project_stores
       checks << check(
         category: "project_stores", name: "project_yml_exists", status: "warn",
         message: "project.yml missing for project '#{slug}'",
-        fixable: true, fix_hint: "Create project.yml from template — see plastic:creating-project"
+        fixable: true, fix_hint: "Create project.yml from template — see plastic-creating-project"
       )
     end
 

package/scripts/hook-auto-arm

@@ -4,7 +4,7 @@
 
 # Usage: hook-auto-arm <message>
 # UserPromptSubmit arming (intent 27). Two jobs, both additive context — never blocks:
-#   1. Detect auto-trigger phrases -> steer the agent to invoke plastic:auto.
+#   1. Detect auto-trigger phrases -> steer the agent to invoke plastic-auto.
 #   2. If auto mode is armed and the active intent hasn't reached How -> remind the agent
 #      that project-code edits are gate-blocked until plan.md + checklist.md exist.
 # Outputs UserPromptSubmit hookSpecificOutput JSON, or exits silently.
@@ -16,11 +16,11 @@ message = (ARGV[0] || "").downcase
 parts = []
 
 # --- 1. Auto-trigger steering ---
-AUTO_TRIGGERS = ["take it from here", "deliver this", "/plastic:auto", "auto mode"].freeze
+AUTO_TRIGGERS = ["take it from here", "deliver this", "/plastic-auto", "auto mode"].freeze
 # bare "auto" only as a standalone word to avoid matching "automatic", "automation", etc.
 triggered = AUTO_TRIGGERS.any? { |p| message.include?(p) } || message.match?(/\bauto\b/)
 if triggered
-  parts << "Auto-mode request detected. Invoke the plastic:auto skill to deliver the " \
+  parts << "Auto-mode request detected. Invoke the plastic-auto skill to deliver the " \
            "active intent autonomously — it arms the lifecycle gate so project code " \
            "cannot be edited before plan.md + checklist.md exist."
 end

package/scripts/hook-continue

@@ -116,7 +116,7 @@ if stale.any?
   parts << ""
 end
 
-parts << "Follow the plastic:continuing skill workflow.\n"
+parts << "Follow the plastic-continuing skill workflow.\n"
 parts << "1. If active intents exist: read their state and resume\n"
 parts << "2. If no active intents: present future intents as options\n"
 parts << "3. If stale intents exist: surface them and ask user to decide"

package/scripts/hook-gate-check

@@ -102,9 +102,9 @@ if is_stage_file || is_action_file
   stage_labels = { "what" => "What", "why" => "Why", "how" => "How", "exec" => "Exec", "done" => "Done" }
   next_hints = {
     "why" => "write spec.md",
-    "how" => "Why complete. Invoke plastic:auto to deliver autonomously, or write plan.md manually.",
-    "exec" => "How complete. Invoke plastic:auto or plastic:executing-plan to execute, or work through the checklist manually.",
-    "done" => "Exec complete. Intent must be completed now — write outcome.md, update INDEX.md, auto-commit. Use plastic:auto or do it manually."
+    "how" => "Why complete. Invoke plastic-auto to deliver autonomously, or write plan.md manually.",
+    "exec" => "How complete. Invoke plastic-auto or plastic-executing-plan to execute, or work through the checklist manually.",
+    "done" => "Exec complete. Intent must be completed now — write outcome.md, update INDEX.md, auto-commit. Use plastic-auto or do it manually."
   }
 
   context_parts = ["PLASTIC"]

package/scripts/hook-session-start

@@ -168,7 +168,7 @@ cache_file = "#{store_root}/.cache/update-check.json"
 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
 

package/scripts/install.rb

@@ -168,6 +168,7 @@ def distribute(mode)
     "scripts/hook-auto-arm" => "scripts/hook-auto-arm",
     "scripts/lib/bridge.rb" => "scripts/lib/bridge.rb",
     "scripts/doctor.rb" => "scripts/doctor.rb",
+    "scripts/dashboard.rb" => "scripts/dashboard.rb",
   }
 
   core_files.each do |src, dest|
@@ -258,6 +259,19 @@ end
 
 # --- Agent adapters ---
 
+def manifest_path_for(key, config)
+  case key
+  when "claude" then File.join(config[:dir], "plastic", "manifest.json")
+  else File.join(config[:dir], "plastic-manifest.json")
+  end
+end
+
+def manifest_files(manifest_path)
+  return [] unless File.exist?(manifest_path)
+  data = JSON.parse(File.read(manifest_path)) rescue {}
+  (data["files"] || {}).keys
+end
+
 def install_for_agent(key, force)
   config = agent_config(key)
   return { agent: config[:name], success: false, reason: "Unknown agent" } unless config
@@ -266,20 +280,47 @@ def install_for_agent(key, force)
     return { agent: config[:name], success: false, reason: "#{config[:dir]} not found \u{2014} #{config[:name]} not installed?" }
   end
 
-  case key
-  when "claude" then install_claude(config, force)
-  when "codex" then install_codex(config, force)
-  when "hermes" then install_hermes(config, force)
+  # Capture the prior manifest so we can prune files that no longer ship
+  # (renamed/removed skills) after a re-copy. This gives leftover-free updates.
+  old_files = manifest_files(manifest_path_for(key, config))
+
+  result = case key
+           when "claude" then install_claude(config, force)
+           when "codex" then install_codex(config, force)
+           when "hermes" then install_hermes(config, force)
+           end
+
+  new_files = manifest_files(manifest_path_for(key, config))
+  pruned = prune_removed_files(old_files - new_files)
+  result[:pruned] = pruned if pruned.positive?
+  result
+end
+
+# Delete tracked files present in the old manifest but absent from the new one,
+# then remove any now-empty skill directories they lived in.
+def prune_removed_files(stale_files)
+  removed = 0
+  dirs = []
+  stale_files.each do |f|
+    if File.exist?(f)
+      File.delete(f)
+      removed += 1
+    end
+    dirs << File.dirname(f)
   end
+  dirs.uniq.sort_by { |d| -d.length }.each do |d|
+    FileUtils.rmdir(d) if File.directory?(d) && Dir.empty?(d)
+  end
+  removed
 end
 
 def install_claude(config, force)
   hooks_dir = File.join(config[:dir], "hooks")
-  skills_dir = File.join(config[:dir], "skills", "plastic")
+  skills_root = File.join(config[:dir], "skills")
   plastic_dir = File.join(config[:dir], "plastic")
 
   FileUtils.mkdir_p(hooks_dir)
-  FileUtils.mkdir_p(skills_dir)
+  FileUtils.mkdir_p(skills_root)
   FileUtils.mkdir_p(plastic_dir)
 
   installed = []
@@ -299,19 +340,19 @@ def install_claude(config, force)
     installed << dest
   end
 
-  # Copy skills recursively
+  # Copy skills as flat, hyphen-namespaced personal skills (plastic-<name>/)
   skills_source = File.join(PACKAGE_ROOT, "skills")
-  installed += copy_dir_recursive(skills_source, skills_dir) if File.directory?(skills_source)
+  installed += install_skills_flat(skills_source, skills_root) if File.directory?(skills_source)
 
   # Write VERSION
   version_file = File.join(plastic_dir, "VERSION")
   File.write(version_file, "#{VERSION}\n")
   installed << version_file
 
-  # Sync marketplace plugin so Claude Code discovers skills
-  sync_marketplace_plugin(config[:dir])
+  # Remove any prior plugin/marketplace install so the layouts don't coexist
+  migrate_legacy_plugin(config[:dir])
 
-  # Merge hooks + enabledPlugins into settings.json
+  # Merge hooks + statusline into settings.json (no plugin registration)
   settings_path = File.join(config[:dir], "settings.json")
   merge_claude_hooks(settings_path)
 
@@ -323,99 +364,106 @@ def install_claude(config, force)
 end
 
 def install_codex(config, force)
-  skills_dir = File.join(config[:dir], "skills", "plastic")
-  FileUtils.mkdir_p(skills_dir)
-
   installed = []
   skills_source = File.join(PACKAGE_ROOT, "skills")
-  installed += copy_dir_recursive(skills_source, skills_dir) if File.directory?(skills_source)
-
-  manifest_path = File.join(config[:dir], "plastic-manifest.json")
-  write_manifest(installed, manifest_path)
+  installed += install_skills_flat(skills_source, File.join(config[:dir], "skills")) if File.directory?(skills_source)
 
+  write_manifest(installed, File.join(config[:dir], "plastic-manifest.json"))
   { agent: config[:name], success: true, files: installed.size }
 end
 
 def install_hermes(config, force)
-  skills_dir = File.join(config[:dir], "skills", "plastic")
-  FileUtils.mkdir_p(skills_dir)
-
   installed = []
   skills_source = File.join(PACKAGE_ROOT, "skills")
-  installed += copy_dir_recursive(skills_source, skills_dir) if File.directory?(skills_source)
-
-  manifest_path = File.join(config[:dir], "plastic-manifest.json")
-  write_manifest(installed, manifest_path)
+  installed += install_skills_flat(skills_source, File.join(config[:dir], "skills")) if File.directory?(skills_source)
 
+  write_manifest(installed, File.join(config[:dir], "plastic-manifest.json"))
   { agent: config[:name], success: true, files: installed.size }
 end
 
-# --- Marketplace plugin sync ---
+# Copy each skills/<name>/ to <skills_root>/plastic-<name>/ (flat, namespaced by
+# directory name — the only personal-skill namespacing Claude Code supports).
+# The non-skill `_active-intent-gate.md` is relocated to ~/.plastic/ instead.
+def install_skills_flat(skills_source, skills_root)
+  installed = []
+  FileUtils.mkdir_p(skills_root)
+
+  Dir.children(skills_source).reject { |e| e.start_with?(".") }.each do |entry|
+    src = File.join(skills_source, entry)
+    if File.directory?(src)
+      installed += copy_dir_recursive(src, File.join(skills_root, "plastic-#{entry}"))
+    elsif entry == "_active-intent-gate.md"
+      FileUtils.mkdir_p(PLASTIC_HOME)
+      dest = File.join(PLASTIC_HOME, entry)
+      FileUtils.cp(src, dest)
+      installed << dest
+    end
+  end
+
+  installed
+end
+
+# --- Legacy plugin migration ---
+
+# Earlier versions registered Plastic as a local marketplace plugin
+# (plastic@plastic) for skill discovery. The current model uses flat,
+# hyphen-namespaced personal skills, so any prior plugin layout is removed here
+# to stop the two coexisting. Returns a list of what was migrated.
+def migrate_legacy_plugin(claude_dir)
+  removed = []
+
+  legacy_dirs = [
+    File.join(claude_dir, "plugins", "marketplaces", "plastic"),
+    File.join(claude_dir, "plugins", "cache", "plastic"),
+    File.join(claude_dir, "skills", "plastic"), # old nested skills layout
+  ]
+  legacy_dirs.each do |d|
+    if File.directory?(d)
+      FileUtils.rm_rf(d)
+      removed << d
+    end
+  end
 
-def sync_marketplace_plugin(claude_dir)
-  marketplace_dir = File.join(claude_dir, "plugins", "marketplaces", "plastic")
-  plugin_meta_dir = File.join(marketplace_dir, ".claude-plugin")
+  # settings.json: drop enabledPlugins + extraKnownMarketplaces entries
+  settings_path = File.join(claude_dir, "settings.json")
+  settings = read_json_safe(settings_path)
+  if settings
+    changed = false
+    if settings.dig("enabledPlugins", "plastic@plastic")
+      settings["enabledPlugins"].delete("plastic@plastic")
+      settings.delete("enabledPlugins") if settings["enabledPlugins"].empty?
+      changed = true
+    end
+    if settings.dig("extraKnownMarketplaces", "plastic")
+      settings["extraKnownMarketplaces"].delete("plastic")
+      settings.delete("extraKnownMarketplaces") if settings["extraKnownMarketplaces"].empty?
+      changed = true
+    end
+    if changed
+      write_json_atomic(settings_path, settings)
+      removed << "settings.json: plastic@plastic plugin registration"
+    end
+  end
 
-  FileUtils.mkdir_p(plugin_meta_dir)
+  # plugins/known_marketplaces.json: drop the plastic entry
+  known_path = File.join(claude_dir, "plugins", "known_marketplaces.json")
+  known = read_json_safe(known_path)
+  if known.is_a?(Hash) && known.key?("plastic")
+    known.delete("plastic")
+    write_json_atomic(known_path, known)
+    removed << "known_marketplaces.json: plastic"
+  end
 
-  plugin_json = {
-    "name" => "plastic",
-    "description" => "Intent-driven state management for AI coding sessions. Neuroplasticity for your codebase.",
-    "version" => VERSION,
-    "author" => { "name" => "Zlatko Alomerovic", "email" => "zlatko.alomerovic@gmail.com" },
-    "homepage" => "https://github.com/zalom/plastic",
-    "repository" => "https://github.com/zalom/plastic",
-    "license" => "MIT",
-    "keywords" => %w[intent-driven state-management zettelkasten ai-agent]
-  }
-  write_json_atomic(File.join(plugin_meta_dir, "plugin.json"), plugin_json)
-
-  marketplace_json = {
-    "name" => "plastic",
-    "description" => "Marketplace for Plastic — intent-driven state management",
-    "owner" => { "name" => "Zlatko Alomerovic", "email" => "zlatko.alomerovic@gmail.com" },
-    "plugins" => [{
-      "name" => "plastic",
-      "description" => "Intent-driven state management for AI coding sessions",
-      "version" => VERSION,
-      "source" => "./",
-      "author" => { "name" => "Zlatko Alomerovic", "email" => "zlatko.alomerovic@gmail.com" }
-    }]
-  }
-  write_json_atomic(File.join(plugin_meta_dir, "marketplace.json"), marketplace_json)
+  unless removed.empty?
+    puts "  \u{1f9f9} Migrated legacy plugin install:"
+    removed.each { |r| puts "     - #{tilde(r)}" }
+  end
 
-  # Sync skills
-  skills_source = File.join(PACKAGE_ROOT, "skills")
-  skills_dest = File.join(marketplace_dir, "skills")
-  if File.directory?(skills_source)
-    FileUtils.rm_rf(skills_dest)
-    copy_dir_recursive(skills_source, skills_dest)
-  end
-
-  # Sync agents
-  agents_source = File.join(PACKAGE_ROOT, "agents")
-  agents_dest = File.join(marketplace_dir, "agents")
-  if File.directory?(agents_source)
-    FileUtils.rm_rf(agents_dest)
-    copy_dir_recursive(agents_source, agents_dest)
-  end
-
-  # Write .claude/settings.json (permissions)
-  claude_settings_dir = File.join(marketplace_dir, ".claude")
-  FileUtils.mkdir_p(claude_settings_dir)
-  write_json_atomic(File.join(claude_settings_dir, "settings.json"), {
-    "permissions" => {
-      "allow" => [
-        "Bash(ruby *)",
-        "Bash(ls *)",
-        "Bash(find *)",
-        "Bash(git *)",
-        "Bash(mkdir *)",
-        "Bash(chmod *)",
-        "mcp__serena__*"
-      ]
-    }
-  })
+  removed
+end
+
+def tilde(path)
+  path.sub(Dir.home, "~")
 end
 
 # --- settings.json merge (read-modify-write, never clobber) ---
@@ -486,13 +534,8 @@ def merge_claude_hooks(settings_path)
 
   settings["statusLine"] = { "type" => "command", "command" => "#{hook_dir}/plastic-statusline" }
 
-  # Register Plastic as an enabled plugin for skill discovery
-  plugins = settings["enabledPlugins"] ||= {}
-  plugins["plastic@plastic"] = true
-
-  # Register the marketplace source
-  marketplaces = settings["extraKnownMarketplaces"] ||= {}
-  marketplaces["plastic"] ||= { "source" => { "source" => "github", "repo" => "zalom/plastic" } }
+  # No plugin/marketplace registration: skills are flat personal skills
+  # (plastic-<name>/) discovered directly from ~/.claude/skills.
 
   write_json_atomic(settings_path, settings)
 end
@@ -526,14 +569,25 @@ def handle_uninstall(agents)
     next unless config
 
     result = uninstall_agent(key, config)
-    if result[:success]
-      puts "  \u{2705} #{config[:name]}: uninstalled (#{result[:files]} files removed)"
-    else
+    unless result[:success]
       puts "  \u{26a0}\u{fe0f}  #{config[:name]}: #{result[:reason]}"
+      next
     end
+
+    puts "  \u{2705} #{config[:name]}: uninstalled (#{result[:files]} files removed)"
+    result[:removed].each { |r| puts "     removed: #{tilde(r)}" }
   end
 
-  puts "\n  Note: ~/.plastic/ (your intent store) is preserved.\n\n"
+  # What was deliberately left behind
+  puts "\n  Left in place (not removed):"
+  puts "     - #{tilde(PLASTIC_HOME)} (your intent store, history, and projects)"
+  puts "     - any non-Plastic entries in settings.json"
+
+  puts "\n  Verify removal:"
+  puts "     ls ~/.claude/skills | grep '^plastic-'      # → no output"
+  puts "     ls ~/.claude/hooks | grep '^plastic-'       # → no output"
+  puts "     grep -c plastic ~/.claude/settings.json     # → only hook refs gone"
+  puts "\n  To also delete your intent store: rm -rf #{tilde(PLASTIC_HOME)}\n\n"
 end
 
 def uninstall_agent(key, config)
@@ -541,45 +595,47 @@ def uninstall_agent(key, config)
     return { success: false, reason: "#{config[:dir]} not found" }
   end
 
-  manifest_path = case key
-                  when "claude" then File.join(config[:dir], "plastic", "manifest.json")
-                  else File.join(config[:dir], "plastic-manifest.json")
-                  end
-
-  files_removed = 0
+  removed = []
+  manifest_path = manifest_path_for(key, config)
 
   if File.exist?(manifest_path)
     manifest = JSON.parse(File.read(manifest_path)) rescue {}
     (manifest["files"] || {}).each_key do |f|
       if File.exist?(f)
         File.delete(f)
-        files_removed += 1
+        removed << f
       end
     end
     File.delete(manifest_path)
-    files_removed += 1
+    removed << manifest_path
   end
 
-  # Clean known directories
-  dirs_to_clean = case key
-                  when "claude"
-                    [
-                      File.join(config[:dir], "plastic"),
-                      File.join(config[:dir], "skills", "plastic"),
-                      File.join(config[:dir], "plugins", "marketplaces", "plastic"),
-                    ]
-                  else [File.join(config[:dir], "skills", "plastic")]
-                  end
+  # Remove flat plastic-<name>/ skill dirs (now-empty after manifest deletion,
+  # plus any the manifest missed) and the plastic state dir.
+  skills_root = File.join(config[:dir], "skills")
+  if File.directory?(skills_root)
+    Dir.children(skills_root).select { |e| e.start_with?("plastic-") }.each do |d|
+      full = File.join(skills_root, d)
+      FileUtils.rm_rf(full)
+      removed << full
+    end
+  end
 
-  dirs_to_clean.each { |d| FileUtils.rm_rf(d) if File.directory?(d) }
+  [File.join(config[:dir], "plastic")].each do |d|
+    if File.directory?(d)
+      FileUtils.rm_rf(d)
+      removed << d
+    end
+  end
 
-  # Clean hooks from settings.json (Claude Code only)
+  # Claude Code: clean hooks/statusline and any legacy plugin registration
   if key == "claude"
     settings_path = File.join(config[:dir], "settings.json")
     remove_claude_hooks(settings_path) if File.exist?(settings_path)
+    removed.concat(migrate_legacy_plugin(config[:dir]))
   end
 
-  { success: true, files: files_removed }
+  { success: true, files: removed.size, removed: removed }
 end
 
 def remove_claude_hooks(settings_path)

package/scripts/lib/bridge.rb

@@ -211,7 +211,7 @@ module Bridge
 
     id = intent_info["id"]
     "intent #{id} has not reached How — write plan.md + checklist.md before " \
-      "editing project code. Run plastic:auto or plastic:writing-plans first. " \
+      "editing project code. Run plastic-auto or plastic-writing-plans first. " \
       "(blocked edit: #{file_abs})"
   end
 

package/scripts/migrate-to-global

@@ -17,7 +17,7 @@ GLOBAL_ROOT="$HOME/.plastic"
 LOCAL_PLASTIC="$PROJECT_PATH/.plastic"
 
 if [ ! -d "$GLOBAL_ROOT" ]; then
-  echo "Error: Global Plastic not installed. Run /plastic:install first." >&2
+  echo "Error: Global Plastic not installed. Run /plastic-install first." >&2
   exit 1
 fi
 

package/skills/_active-intent-gate.md

@@ -13,7 +13,7 @@ Before proceeding, resolve the active intent:
    - Look under `## Active` for intent entries
    - If exactly one active intent → use it
    - If multiple active intents → ask user which one
-   - If no active intent → refuse: "No active intent. Create one first with /plastic:creating-intent"
+   - If no active intent → refuse: "No active intent. Create one first with /plastic-creating-intent"
 
 3. **Resolve paths:**
    - Intent directory: `{store}/store/{id}--{slug}/`