@zalom/plastic 1.0.0-alpha.14 → 1.0.0-alpha.16

package/scripts/install.rb

@@ -165,6 +165,7 @@ def distribute(mode)
     "scripts/hook-future-intent-check" => "scripts/hook-future-intent-check",
     "scripts/hook-gate-check" => "scripts/hook-gate-check",
     "scripts/hook-code-gate" => "scripts/hook-code-gate",
+    "scripts/hook-auto-arm" => "scripts/hook-auto-arm",
     "scripts/lib/bridge.rb" => "scripts/lib/bridge.rb",
     "scripts/doctor.rb" => "scripts/doctor.rb",
   }
@@ -257,6 +258,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
@@ -265,20 +279,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 = []
@@ -298,19 +339,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)
 
@@ -322,99 +363,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) ---
@@ -485,13 +533,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
@@ -525,14 +568,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)
@@ -540,45 +594,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}/`

package/skills/auto/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: plastic:auto
+name: plastic-auto
 description: >-
   Autonomous intent delivery — agent takes over How and Exec. Use when user says
   "auto", "take it from here", "deliver this", or when brainstorming-grill-me concludes
@@ -12,7 +12,7 @@ Announce: "Taking over intent [ID] — [name] for autonomous delivery."
 
 ## Precondition
 
-An active intent MUST exist in INDEX.md. If none exists, refuse: "No active intent found. Create one first with /plastic:creating-intent."
+An active intent MUST exist in INDEX.md. If none exists, refuse: "No active intent found. Create one first with /plastic-creating-intent."
 
 If multiple active intents exist, ask the user which one to deliver (this is the only question auto asks).
 
@@ -86,7 +86,7 @@ If the plan calls for creating a new project (the intent is an implementation in
 1. Determine project path from `~/.plastic/config.yml` `project_roots` or from intent context
 2. **Confirm path with user** — this is the ONE human interaction during auto delivery:
    > "Creating project `<slug>` at `<path>`. Confirm path, or provide alternative."
-3. Invoke `plastic:creating-project` skill
+3. Invoke `plastic-creating-project` skill
 4. The global intent is now Completed (creating-project handles this)
 5. The tactical mirror in the project store becomes the active intent
 6. Continue execution from the project directory using the tactical intent
@@ -94,7 +94,7 @@ If the plan calls for creating a new project (the intent is an implementation in
 ## Exec Phase
 
 1. If `superpowers:subagent-driven-development` or `superpowers:executing-plans` is available, delegate execution to it
-2. Otherwise invoke `plastic:executing-plan`
+2. Otherwise invoke `plastic-executing-plan`
 3. Execute actions from checklist sequentially
 4. Check off items in `checklist.md` as completed
 5. Append observations to `## Insights` with `(autonomous)` marker
@@ -143,9 +143,9 @@ During initial project creation, all decisions are non-destructive by definition
         - `fix_and_retry` — attempt to fix the failure, re-run verify (max 2 retries)
         - `stop` — write `savepoint.md` with current state, notify user: "Verify failed — savepoint written.", **STOP**
         - `manual` — notify user: "Verify failed: [summary]. Resolve manually."
-   5. If `release.on_green` has items, invoke `plastic:releasing` to handle them (tag, changelog, publish, etc.). Do NOT duplicate release logic — delegate entirely.
+   5. If `release.on_green` has items, invoke `plastic-releasing` to handle them (tag, changelog, publish, etc.). Do NOT duplicate release logic — delegate entirely.
 5. Review `## Insights` for observations that should spawn future intents. If any:
-   - Create them (using `plastic:creating-intent` conventions)
+   - Create them (using `plastic-creating-intent` conventions)
    - Update `chain` in the current intent's frontmatter
 6. Move intent from `## Active` to `## Completed` in INDEX.md (with today's date)
 7. Auto-commit: `cd <store-root> && git add . && git commit -m "feat: deliver intent <ID> — <name>"`

package/skills/auto/evals/evals.json

@@ -1,5 +1,5 @@
 {
-  "skill_name": "plastic:auto",
+  "skill_name": "plastic-auto",
   "notes": "Intent 27. Scopes: description triggering (1-8) and behavior/output quality (9). Assertions written after observing Step-3 runs (one clean subagent router per case).",
   "results": {
     "triggering": { "cases": 8, "passed": 8, "pass_at_1": 1.0, "run": "2026-06-10, one subagent per case" },
@@ -9,73 +9,73 @@
     {
       "id": 1, "scope": "triggering", "set": "train",
       "prompt": "auto",
-      "expected_output": "Activates plastic:auto (the bare 'auto' keyword is the documented trigger).",
+      "expected_output": "Activates plastic-auto (the bare 'auto' keyword is the documented trigger).",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic:auto", "observed": "plastic:auto", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-auto", "observed": "plastic-auto", "result": "pass" }
       ]
     },
     {
       "id": 2, "scope": "triggering", "set": "train",
       "prompt": "take it from here and deliver intent 27 end to end",
-      "expected_output": "Activates plastic:auto (autonomous delivery of an active intent).",
+      "expected_output": "Activates plastic-auto (autonomous delivery of an active intent).",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic:auto", "observed": "plastic:auto", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-auto", "observed": "plastic-auto", "result": "pass" }
       ]
     },
     {
       "id": 3, "scope": "triggering", "set": "validation",
       "prompt": "go fully autonomous on the active intent, don't ask me questions",
-      "expected_output": "Activates plastic:auto.",
+      "expected_output": "Activates plastic-auto.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic:auto", "observed": "plastic:auto", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-auto", "observed": "plastic-auto", "result": "pass" }
       ]
     },
     {
       "id": 4, "scope": "triggering", "set": "train",
       "prompt": "deliver this intent for me",
-      "expected_output": "Activates plastic:auto.",
+      "expected_output": "Activates plastic-auto.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE == plastic:auto", "observed": "plastic:auto", "result": "pass" }
+        { "type": "code", "check": "router CHOICE == plastic-auto", "observed": "plastic-auto", "result": "pass" }
       ]
     },
     {
       "id": 5, "scope": "triggering", "set": "train",
       "prompt": "set up a hook to automatically format the file on every save",
-      "expected_output": "Does NOT activate plastic:auto. Near-miss: shares 'auto*' but is a settings/hooks task (update-config).",
+      "expected_output": "Does NOT activate plastic-auto. Near-miss: shares 'auto*' but is a settings/hooks task (update-config).",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic:auto", "observed": "update-config", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-auto", "observed": "update-config", "result": "pass" }
       ]
     },
     {
       "id": 6, "scope": "triggering", "set": "validation",
       "prompt": "deliver the built package to the dist directory",
-      "expected_output": "Does NOT activate plastic:auto. Near-miss: shares 'deliver' but is a build/file task.",
+      "expected_output": "Does NOT activate plastic-auto. Near-miss: shares 'deliver' but is a build/file task.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic:auto", "observed": "none", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-auto", "observed": "none", "result": "pass" }
       ]
     },
     {
       "id": 7, "scope": "triggering", "set": "train",
       "prompt": "create a new intent for the dashboard idea",
-      "expected_output": "Does NOT activate plastic:auto; activates plastic:creating-intent.",
+      "expected_output": "Does NOT activate plastic-auto; activates plastic-creating-intent.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic:auto", "observed": "plastic:creating-intent", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-auto", "observed": "plastic-creating-intent", "result": "pass" }
       ]
     },
     {
       "id": 8, "scope": "triggering", "set": "validation",
       "prompt": "what's the status of my active intents?",
-      "expected_output": "Does NOT activate plastic:auto; this is a read/continuing/managing-index query.",
+      "expected_output": "Does NOT activate plastic-auto; this is a read/continuing/managing-index query.",
       "files": [],
       "assertions": [
-        { "type": "code", "check": "router CHOICE != plastic:auto", "observed": "plastic:managing-index", "result": "pass" }
+        { "type": "code", "check": "router CHOICE != plastic-auto", "observed": "plastic-managing-index", "result": "pass" }
       ]
     },
     {

package/skills/auto/references/agent-architecture.md

@@ -37,7 +37,7 @@ Rules:
 
 Human owns What and Why for human-initiated intents. Agent assists (research,
 exploration) but human drives until handoff. When Why is complete — or human
-triggers `plastic:auto` — the agent takes over How and Exec autonomously.
+triggers `plastic-auto` — the agent takes over How and Exec autonomously.
 
 - **Safe-by-default:** Agent always prefers non-destructive routes (rename vs
   delete, additive migrations, backups before changes). Destructive actions on

package/skills/brainstorming/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: plastic:brainstorming
+name: plastic-brainstorming
 description: "Explore intent requirements and design before implementation. Produces spec.md in the active intent directory."
 ---
 
@@ -20,7 +20,7 @@ Do NOT invoke any implementation skill, write any code, scaffold any project, or
 Before proceeding, resolve the active intent:
 
 1. **Detect store:** Read `~/.plastic/projects.yml`, match CWD against registered project paths. If match → project store at `~/.plastic/projects/{slug}/store/`. If no match → global store at `~/.plastic/store/`.
-2. **Find active intent:** Read `INDEX.md` from the detected store. Look under `## Active`. If exactly one → use it. If multiple → ask which. If none → refuse: "No active intent. Create one first with /plastic:creating-intent"
+2. **Find active intent:** Read `INDEX.md` from the detected store. Look under `## Active`. If exactly one → use it. If multiple → ask which. If none → refuse: "No active intent. Create one first with /plastic-creating-intent"
 3. **Resolve intent directory:** `{store}/store/{id}--{slug}/`
 
 All artifacts go to the intent directory. Never write to external paths.
@@ -40,7 +40,7 @@ You MUST create a task for each of these items and complete them in order:
 5. **Write spec** — save to `{intent_dir}/spec.md` and commit to store repo
 6. **Spec self-review** — placeholder scan, consistency, scope, ambiguity
 7. **User reviews written spec** — ask user to review before proceeding
-8. **Transition to planning** — invoke `plastic:writing-plans`
+8. **Transition to planning** — invoke `plastic-writing-plans`
 
 ## Process Flow
 
@@ -54,7 +54,7 @@ digraph brainstorming {
     "Write spec" [shape=box];
     "Spec self-review\n(fix inline)" [shape=box];
     "User reviews spec?" [shape=diamond];
-    "Invoke plastic:writing-plans" [shape=doublecircle];
+    "Invoke plastic-writing-plans" [shape=doublecircle];
 
     "Explore project context" -> "Ask clarifying questions";
     "Ask clarifying questions" -> "Propose 2-3 approaches";
@@ -65,11 +65,11 @@ digraph brainstorming {
     "Write spec" -> "Spec self-review\n(fix inline)";
     "Spec self-review\n(fix inline)" -> "User reviews spec?";
     "User reviews spec?" -> "Write spec" [label="changes requested"];
-    "User reviews spec?" -> "Invoke plastic:writing-plans" [label="approved"];
+    "User reviews spec?" -> "Invoke plastic-writing-plans" [label="approved"];
 }
 ```
 
-**The terminal state is invoking `plastic:writing-plans`.** Do NOT invoke any other implementation skill. The ONLY skill you invoke after brainstorming is `plastic:writing-plans`.
+**The terminal state is invoking `plastic-writing-plans`.** Do NOT invoke any other implementation skill. The ONLY skill you invoke after brainstorming is `plastic-writing-plans`.
 
 ## The Process
 
@@ -130,8 +130,8 @@ After the spec review loop passes, ask the user to review the written spec befor
 Wait for the user's response. If they request changes, make them and re-run the spec review loop. Only proceed once the user approves.
 
 **Implementation:**
-- Invoke `plastic:writing-plans` to create the implementation plan
-- Do NOT invoke any other skill. `plastic:writing-plans` is the next step.
+- Invoke `plastic-writing-plans` to create the implementation plan
+- Do NOT invoke any other skill. `plastic-writing-plans` is the next step.
 
 ## Key Principles