@zalom/plastic 1.0.0-alpha.1 → 1.0.0-alpha.3

package/package.json

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

package/scripts/install.rb

@@ -141,13 +141,18 @@ def distribute(mode)
   puts "  \u{1f4e6} #{mode == :update ? "Updating" : "Installing"} core files to #{PLASTIC_HOME}"
 
   FileUtils.mkdir_p(PLASTIC_HOME)
-  FileUtils.mkdir_p(File.join(PLASTIC_HOME, "scripts"))
+  FileUtils.mkdir_p(File.join(PLASTIC_HOME, "scripts", "lib"))
 
   core_files = {
     "PLASTIC.md" => "PLASTIC.md",
     "deprecations.yml" => "deprecations.yml",
     "scripts/folgezettel-id" => "scripts/folgezettel-id",
     "scripts/read-config" => "scripts/read-config",
+    "scripts/hook-session-start" => "scripts/hook-session-start",
+    "scripts/hook-continue" => "scripts/hook-continue",
+    "scripts/hook-future-intent-check" => "scripts/hook-future-intent-check",
+    "scripts/hook-gate-check" => "scripts/hook-gate-check",
+    "scripts/lib/bridge.rb" => "scripts/lib/bridge.rb",
   }
 
   core_files.each do |src, dest|
@@ -239,7 +244,7 @@ def install_claude(config, force)
 
   installed = []
 
-  # Copy hooks
+  # Copy hooks, rewriting script paths for the installed location
   hook_source = File.join(PACKAGE_ROOT, "hooks")
   Dir.glob(File.join(hook_source, "*")).each do |f|
     next unless File.file?(f)
@@ -247,7 +252,9 @@ def install_claude(config, force)
     next if %w[hooks.json run-hook].include?(basename)
     dest_name = basename.start_with?("plastic-") ? basename : "plastic-#{basename}"
     dest = File.join(hooks_dir, dest_name)
-    FileUtils.cp(f, dest)
+    content = File.read(f)
+    content = content.gsub('$SCRIPT_DIR/../scripts/', '$HOME/.plastic/scripts/')
+    File.write(dest, content)
     FileUtils.chmod(0o755, dest)
     installed << dest
   end
@@ -304,42 +311,78 @@ end
 
 def merge_claude_hooks(settings_path)
   settings = read_json_safe(settings_path) || {}
-  return if settings.nil? # unparseable — refuse to modify
+  return if settings.nil?
 
   hooks = settings["hooks"] ||= {}
   hook_dir = File.join(Dir.home, ".claude", "hooks")
 
+  purge_stale_plastic_hooks(hooks)
+
   plastic_hooks = {
-    "SessionStart" => [
-      { "type" => "command", "command" => "ruby #{hook_dir}/plastic-session-start", "statusMessage" => "Loading Plastic context..." },
-      { "type" => "command", "command" => "#{hook_dir}/plastic-check-update", "statusMessage" => "" },
-    ],
-    "PreCompact" => [
-      { "type" => "command", "command" => "ruby #{hook_dir}/plastic-savepoint", "statusMessage" => "Saving Plastic intent state..." },
-    ],
-    "PostToolUse" => [
-      { "matcher" => "Write|Edit", "type" => "command", "command" => "#{hook_dir}/plastic-gate-check", "statusMessage" => "Checking lifecycle gates..." },
-    ],
-    "UserPromptSubmit" => [
-      { "type" => "command", "command" => "#{hook_dir}/plastic-continue", "statusMessage" => "Checking for continue..." },
-      { "type" => "command", "command" => "#{hook_dir}/plastic-future-intent-check", "statusMessage" => "Checking future intents..." },
-    ],
-    "statusLine" => [
-      { "type" => "command", "command" => "#{hook_dir}/plastic-statusline" },
-    ],
+    "SessionStart" => {
+      "matcher" => "",
+      "hooks" => [
+        { "type" => "command", "command" => "#{hook_dir}/plastic-session-start", "statusMessage" => "Loading Plastic context..." },
+        { "type" => "command", "command" => "#{hook_dir}/plastic-check-update", "statusMessage" => "" },
+      ],
+    },
+    "PreCompact" => {
+      "matcher" => "",
+      "hooks" => [
+        { "type" => "command", "command" => "#{hook_dir}/plastic-savepoint", "statusMessage" => "Saving Plastic intent state..." },
+      ],
+    },
+    "PostToolUse" => {
+      "matcher" => "Write|Edit",
+      "hooks" => [
+        { "type" => "command", "command" => "#{hook_dir}/plastic-gate-check", "statusMessage" => "Checking lifecycle gates..." },
+      ],
+    },
+    "UserPromptSubmit" => {
+      "matcher" => "",
+      "hooks" => [
+        { "type" => "command", "command" => "#{hook_dir}/plastic-continue", "statusMessage" => "Checking for continue..." },
+        { "type" => "command", "command" => "#{hook_dir}/plastic-future-intent-check", "statusMessage" => "Checking future intents..." },
+      ],
+    },
   }
 
-  plastic_hooks.each do |event, entries|
+  plastic_hooks.each do |event, group|
     hooks[event] ||= []
-    entries.each do |entry|
-      already = hooks[event].any? { |h| h["command"] == entry["command"] }
-      hooks[event] << entry unless already
+    existing = hooks[event].find { |g| g.is_a?(Hash) && g["hooks"].is_a?(Array) && g["hooks"].any? { |h| h["command"].to_s.include?("plastic-") } }
+
+    if existing
+      existing["matcher"] = group["matcher"]
+      existing["hooks"] = group["hooks"]
+    else
+      hooks[event] << group
     end
   end
 
+  settings["statusLine"] = { "type" => "command", "command" => "#{hook_dir}/plastic-statusline" }
+
   write_json_atomic(settings_path, settings)
 end
 
+def purge_stale_plastic_hooks(hooks)
+  stale = ->(cmd) { cmd.to_s.match?(/ruby\s+.*plastic-/) || cmd.to_s.match?(/plastic-[a-z-]+\.rb/) }
+
+  hooks.each do |event, groups|
+    next unless groups.is_a?(Array)
+
+    hooks[event] = groups.map do |group|
+      if group.is_a?(Hash) && group["hooks"].is_a?(Array)
+        group["hooks"].reject! { |h| stale.call(h["command"]) }
+        group unless group["hooks"].empty?
+      elsif group.is_a?(Hash) && group["command"]
+        stale.call(group["command"]) ? nil : group
+      else
+        group
+      end
+    end.compact
+  end
+end
+
 # --- Uninstall ---
 
 def handle_uninstall(agents)
@@ -403,11 +446,24 @@ def remove_claude_hooks(settings_path)
   settings = read_json_safe(settings_path)
   return unless settings && settings["hooks"]
 
-  settings["hooks"].each do |event, entries|
-    settings["hooks"][event] = entries.reject { |h| (h["command"] || "").include?("plastic-") }
+  settings["hooks"].each do |event, groups|
+    next unless groups.is_a?(Array)
+
+    settings["hooks"][event] = groups.map do |group|
+      if group.is_a?(Hash) && group["hooks"].is_a?(Array)
+        group["hooks"].reject! { |h| h["command"].to_s.include?("plastic-") }
+        group unless group["hooks"].empty?
+      elsif group.is_a?(Hash) && group["command"]
+        group["command"].to_s.include?("plastic-") ? nil : group
+      else
+        group
+      end
+    end.compact
   end
-  settings["hooks"].delete_if { |_, v| v.empty? }
+
+  settings["hooks"].delete_if { |_, v| v.is_a?(Array) && v.empty? }
   settings.delete("hooks") if settings["hooks"]&.empty?
+  settings.delete("statusLine") if settings.dig("statusLine", "command").to_s.include?("plastic-")
 
   write_json_atomic(settings_path, settings)
 end