laminark 2.21.9 → 2.22.1

package/plugin/scripts/dev-sync.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 # Sync dev plugin build to the cached Claude Code plugin installation.
-# Run after `npm run build` to hot-update the running plugin without restarting.
+# Run after `npm run build` to hot-update the running plugin.
 #
 # Usage: ./plugin/scripts/dev-sync.sh
 #
-# Note: Static files (UI, hooks) take effect immediately on next page load.
-#       Compiled server code (dist/) requires a Claude Code session restart
-#       to pick up API changes.
+# Note: If you used local-install.sh (symlink mode), this script is
+# unnecessary — changes are live immediately. This script is for when
+# the cache contains a real copy (e.g. from install.sh).
+#
+# Static files (UI, hooks) take effect immediately on next page load.
+# Compiled server code (dist/) requires a Claude Code session restart.
 
 set -e
 
@@ -27,20 +30,30 @@ fi
 # Find cached installation(s)
 if [ ! -d "$CACHE_BASE" ]; then
   echo "Error: No cached Laminark plugin found at $CACHE_BASE"
-  echo "Install Laminark first: claude plugin add laminark"
+  echo "Install Laminark first: ./plugin/scripts/install.sh"
   exit 1
 fi
 
 # Sync to every cached version (usually just one)
 SYNCED=0
+SKIPPED=0
 for CACHE_DIR in "$CACHE_BASE"/*/; do
   [ -d "$CACHE_DIR" ] || continue
   VERSION=$(basename "$CACHE_DIR")
 
+  # Skip symlinks (local-install.sh dev mode — already live)
+  if [ -L "${CACHE_DIR%/}" ]; then
+    echo "Skipped $VERSION (symlink — already live)"
+    SKIPPED=$((SKIPPED + 1))
+    continue
+  fi
+
   rsync -a --delete \
     --exclude '*.db' \
     --exclude '*.db-wal' \
     --exclude '*.db-shm' \
+    --exclude '.repair-log' \
+    --exclude '.npm-tmp' \
     --exclude 'node_modules' \
     "$PLUGIN_SRC/" "$CACHE_DIR"
 
@@ -48,11 +61,16 @@ for CACHE_DIR in "$CACHE_BASE"/*/; do
   SYNCED=$((SYNCED + 1))
 done
 
-if [ "$SYNCED" -eq 0 ]; then
+if [ "$SYNCED" -eq 0 ] && [ "$SKIPPED" -eq 0 ]; then
   echo "Error: No version directories found in $CACHE_BASE"
   exit 1
 fi
 
 echo ""
-echo "Done. $SYNCED cached installation(s) updated."
-echo "UI changes are live. API changes need a session restart."
+if [ "$SYNCED" -gt 0 ]; then
+  echo "Done. $SYNCED cached installation(s) updated."
+  echo "UI changes are live. API changes need a session restart."
+fi
+if [ "$SKIPPED" -gt 0 ]; then
+  echo "$SKIPPED symlinked installation(s) skipped (already live)."
+fi

package/plugin/scripts/doctor.sh

@@ -0,0 +1,235 @@
+#!/bin/bash
+# Laminark Doctor — diagnose and fix plugin health issues
+#
+# Checks:
+#   1. Global plugin enabled check
+#   2. All runtime dependencies installed and loadable
+#   3. Native addons built correctly
+#   4. Dist files present and non-empty
+#
+# Usage: bash plugin/scripts/doctor.sh [--fix]
+#   Without --fix: dry-run, reports issues only
+#   With --fix:    automatically repairs what it can
+set -uo pipefail
+
+PLUGIN_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+PROJECT_ROOT="$(cd "$PLUGIN_ROOT/.." && pwd)"
+REPAIR_LOG="$PLUGIN_ROOT/.repair-log"
+FIX=false
+ISSUES=0
+FIXED=0
+
+if [[ "${1:-}" == "--fix" ]]; then
+  FIX=true
+fi
+
+# --- Helpers ---
+
+log() {
+  echo "$1"
+  echo "[$(date -Iseconds)] doctor: $1" >> "$REPAIR_LOG"
+}
+
+ok()   { echo "  ✓ $1"; }
+warn() { echo "  ✗ $1"; ((ISSUES++)); }
+info() { echo "  → $1"; }
+
+# --- 1. Global Plugin Check ---
+
+echo ""
+echo "=== Plugin Check ==="
+
+CLAUDE_SETTINGS="$HOME/.claude/settings.json"
+LOCAL_SETTINGS="$PROJECT_ROOT/.claude/settings.local.json"
+
+if [ -f "$CLAUDE_SETTINGS" ]; then
+  if node -e "
+    const s = require('$CLAUDE_SETTINGS');
+    const ep = s.enabledPlugins || {};
+    const active = Object.entries(ep).some(([k,v]) => k.includes('laminark') && v === true);
+    process.exit(active ? 0 : 1);
+  " 2>/dev/null; then
+    ok "Global Laminark plugin is enabled"
+  else
+    info "Global Laminark plugin is not enabled"
+  fi
+else
+  info "No global Claude settings found"
+fi
+
+# Check if local settings accidentally disable the plugin
+if [ -f "$LOCAL_SETTINGS" ]; then
+  if node -e "
+    const s = require('$LOCAL_SETTINGS');
+    const ep = s.enabledPlugins || {};
+    const disabled = Object.entries(ep).some(([k,v]) => k.includes('laminark') && v === false);
+    process.exit(disabled ? 0 : 1);
+  " 2>/dev/null; then
+    warn "Local settings disable Laminark plugin (enabledPlugins set to false)"
+    if $FIX; then
+      node -e "
+        const fs = require('fs');
+        const s = JSON.parse(fs.readFileSync('$LOCAL_SETTINGS', 'utf-8'));
+        if (s.enabledPlugins) {
+          for (const key of Object.keys(s.enabledPlugins)) {
+            if (key.includes('laminark')) delete s.enabledPlugins[key];
+          }
+          if (Object.keys(s.enabledPlugins).length === 0) delete s.enabledPlugins;
+        }
+        fs.writeFileSync('$LOCAL_SETTINGS', JSON.stringify(s, null, 2) + '\n');
+      "
+      info "Fixed: removed plugin override from local settings"
+      ((FIXED++))
+    else
+      info "Run with --fix to remove the override"
+    fi
+  fi
+fi
+
+# --- 2. Runtime Dependencies ---
+
+echo ""
+echo "=== Dependency Check ==="
+
+# Read dependencies from package.json dynamically
+DEPS=$(node -e "
+  const pkg = require('$PLUGIN_ROOT/package.json');
+  const deps = Object.keys(pkg.dependencies || {});
+  deps.forEach(d => console.log(d));
+" 2>/dev/null)
+
+if [ -z "$DEPS" ]; then
+  warn "Could not read dependencies from package.json"
+else
+  MISSING_DEPS=()
+  for dep in $DEPS; do
+    if [ -d "$PLUGIN_ROOT/node_modules/$dep" ]; then
+      # Check if the module resolves (try CJS require.resolve, fall back to ESM import check)
+      if node -e "require.resolve('$dep', { paths: ['$PLUGIN_ROOT'] })" 2>/dev/null || \
+         node --input-type=module -e "import('$dep').catch(() => process.exit(1))" 2>/dev/null || \
+         [ -f "$PLUGIN_ROOT/node_modules/$dep/package.json" ]; then
+        ok "$dep"
+      else
+        warn "$dep installed but fails to resolve"
+        MISSING_DEPS+=("$dep")
+      fi
+    else
+      warn "$dep not installed"
+      MISSING_DEPS+=("$dep")
+    fi
+  done
+
+  if [ ${#MISSING_DEPS[@]} -gt 0 ] && $FIX; then
+    log "Reinstalling dependencies..."
+    NPM_TMP="$PLUGIN_ROOT/.npm-tmp"
+    mkdir -p "$NPM_TMP"
+    TMPDIR="$NPM_TMP" npm install --prefix "$PLUGIN_ROOT" --omit=dev --ignore-scripts --silent --cache "$NPM_TMP/cache" 2>>"$REPAIR_LOG"
+    rm -rf "$NPM_TMP"
+    info "Fixed: ran npm install for ${#MISSING_DEPS[@]} missing dep(s)"
+    FIXED=$((FIXED + ${#MISSING_DEPS[@]}))
+  fi
+fi
+
+# --- 3. Native Addons ---
+
+echo ""
+echo "=== Native Addon Check ==="
+
+# better-sqlite3 native addon
+BS3_ADDON="$PLUGIN_ROOT/node_modules/better-sqlite3/build/Release/better_sqlite3.node"
+if [ -f "$BS3_ADDON" ]; then
+  if node -e "require('better-sqlite3')" --prefix "$PLUGIN_ROOT" 2>/dev/null || \
+     node -e "const p = '$PLUGIN_ROOT'; require(p + '/node_modules/better-sqlite3')" 2>/dev/null; then
+    ok "better-sqlite3 native addon loads"
+  else
+    warn "better-sqlite3 addon exists but fails to load"
+    if $FIX; then
+      log "Rebuilding better-sqlite3..."
+      npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>>"$REPAIR_LOG"
+      if node -e "require('$PLUGIN_ROOT/node_modules/better-sqlite3')" 2>/dev/null; then
+        info "Fixed: rebuilt better-sqlite3"
+        ((FIXED++))
+      else
+        warn "Rebuild failed — may need full reinstall (rm -rf node_modules + npm install)"
+      fi
+    fi
+  fi
+else
+  warn "better-sqlite3 native addon binary missing"
+  if $FIX; then
+    log "Rebuilding better-sqlite3 native addon..."
+    npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>>"$REPAIR_LOG"
+    if [ -f "$BS3_ADDON" ]; then
+      info "Fixed: rebuilt better-sqlite3 addon"
+      ((FIXED++))
+    else
+      warn "Rebuild did not produce addon — running full reinstall"
+      rm -rf "$PLUGIN_ROOT/node_modules"
+      NPM_TMP="$PLUGIN_ROOT/.npm-tmp"
+      mkdir -p "$NPM_TMP"
+      TMPDIR="$NPM_TMP" npm install --prefix "$PLUGIN_ROOT" --omit=dev --ignore-scripts --silent --cache "$NPM_TMP/cache" 2>>"$REPAIR_LOG"
+      npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>>"$REPAIR_LOG"
+      rm -rf "$NPM_TMP"
+      if [ -f "$BS3_ADDON" ]; then
+        info "Fixed: full reinstall + rebuild"
+        ((FIXED++))
+      else
+        warn "Full reinstall failed — check $REPAIR_LOG"
+      fi
+    fi
+  fi
+fi
+
+# --- 4. Dist Files ---
+
+echo ""
+echo "=== Dist File Check ==="
+
+DIST_FILES=(
+  "dist/index.js"
+  "dist/hooks/handler.js"
+  "dist/analysis/worker.js"
+)
+
+for f in "${DIST_FILES[@]}"; do
+  path="$PLUGIN_ROOT/$f"
+  if [ -s "$path" ]; then
+    ok "$f"
+  elif [ -f "$path" ]; then
+    warn "$f exists but is empty"
+  else
+    warn "$f missing"
+  fi
+done
+
+# Check for stale chunk references — dist/*.mjs files referenced in index.js should exist
+if [ -f "$PLUGIN_ROOT/dist/index.js" ]; then
+  CHUNKS=$(grep -oP '[a-zA-Z0-9_-]+-[a-zA-Z0-9_-]+\.mjs' "$PLUGIN_ROOT/dist/index.js" 2>/dev/null | sort -u)
+  for chunk in $CHUNKS; do
+    if [ -f "$PLUGIN_ROOT/dist/$chunk" ]; then
+      ok "chunk $chunk"
+    else
+      warn "chunk $chunk referenced in index.js but missing (stale build?)"
+    fi
+  done
+fi
+
+# --- Summary ---
+
+echo ""
+echo "=== Summary ==="
+if [ $ISSUES -eq 0 ]; then
+  echo "  All checks passed. Plugin is healthy."
+elif $FIX; then
+  echo "  Found $ISSUES issue(s), fixed $FIXED."
+  REMAINING=$((ISSUES - FIXED))
+  if [ $REMAINING -gt 0 ]; then
+    echo "  $REMAINING issue(s) could not be auto-fixed. Check $REPAIR_LOG"
+    exit 1
+  fi
+else
+  echo "  Found $ISSUES issue(s). Run with --fix to repair."
+  exit 1
+fi
+
+exit 0

package/plugin/scripts/ensure-deps.sh

@@ -1,15 +1,95 @@
 #!/bin/bash
 # Auto-install production dependencies if missing (first run after plugin install)
 PLUGIN_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+REPAIR_LOG="$PLUGIN_ROOT/.repair-log"
+
+log_repair() {
+  echo "[$(date -Iseconds)] ensure-deps: $1" >> "$REPAIR_LOG"
+}
+
+verify_better_sqlite3() {
+  node -e "require('better-sqlite3')" 2>/dev/null
+}
+
 if [ ! -d "$PLUGIN_ROOT/node_modules/better-sqlite3/build" ]; then
   # Use local tmp dir to avoid EXDEV errors on btrfs subvolumes / cross-device setups
   NPM_TMP="$PLUGIN_ROOT/.npm-tmp"
   mkdir -p "$NPM_TMP"
+
+  log_repair "Dependencies missing, running npm install"
+
   # Install deps without running install scripts (sharp build fails without node-addon-api)
   # then selectively rebuild better-sqlite3 which needs its native addon
-  TMPDIR="$NPM_TMP" npm install --prefix "$PLUGIN_ROOT" --omit=dev --ignore-scripts --silent --cache "$NPM_TMP/cache" 2>/dev/null
-  npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>/dev/null
+  TMPDIR="$NPM_TMP" npm install --prefix "$PLUGIN_ROOT" --omit=dev --ignore-scripts --silent --cache "$NPM_TMP/cache" 2>>"$REPAIR_LOG"
+  npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>>"$REPAIR_LOG"
   rm -rf "$NPM_TMP"
+
+  # Verify that better-sqlite3 actually loads
+  if ! verify_better_sqlite3; then
+    log_repair "WARN: better-sqlite3 failed to load after install, retrying with clean node_modules"
+    rm -rf "$PLUGIN_ROOT/node_modules"
+    NPM_TMP="$PLUGIN_ROOT/.npm-tmp"
+    mkdir -p "$NPM_TMP"
+    TMPDIR="$NPM_TMP" npm install --prefix "$PLUGIN_ROOT" --omit=dev --ignore-scripts --silent --cache "$NPM_TMP/cache" 2>>"$REPAIR_LOG"
+    npm rebuild --prefix "$PLUGIN_ROOT" better-sqlite3 --silent 2>>"$REPAIR_LOG"
+    rm -rf "$NPM_TMP"
+
+    if verify_better_sqlite3; then
+      log_repair "OK: better-sqlite3 loaded after clean reinstall"
+    else
+      log_repair "ERROR: better-sqlite3 still fails after clean reinstall"
+    fi
+  else
+    log_repair "OK: better-sqlite3 verified successfully"
+  fi
 fi
+
+# Auto-provision and auto-update CLAUDE.md with Laminark instructions
+CLAUDE_HOME="${CLAUDE_HOME:-$HOME/.claude}"
+CLAUDE_MD="$CLAUDE_HOME/CLAUDE.md"
+LAMINARK_MD="$PLUGIN_ROOT/CLAUDE.md"
+MARKER_START="<!-- laminark:instructions:v"
+MARKER_END="<!-- /laminark:instructions -->"
+
+if [ -f "$LAMINARK_MD" ]; then
+  NEW_MARKER=$(head -1 "$LAMINARK_MD" | grep -o 'laminark:instructions:v[0-9]*' || echo "")
+  mkdir -p "$CLAUDE_HOME"
+
+  if [ ! -f "$CLAUDE_MD" ]; then
+    # No CLAUDE.md — create with our instructions
+    cp "$LAMINARK_MD" "$CLAUDE_MD"
+    log_repair "Created $CLAUDE_MD with Laminark instructions ($NEW_MARKER)"
+
+  elif ! grep -q "$MARKER_START" "$CLAUDE_MD" 2>/dev/null; then
+    # CLAUDE.md exists but has no Laminark block — append
+    printf '\n' >> "$CLAUDE_MD"
+    cat "$LAMINARK_MD" >> "$CLAUDE_MD"
+    log_repair "Appended Laminark instructions to $CLAUDE_MD ($NEW_MARKER)"
+
+  elif [ -n "$NEW_MARKER" ]; then
+    # Laminark block exists — check if version is current
+    CURRENT_MARKER=$(grep -o 'laminark:instructions:v[0-9]*' "$CLAUDE_MD" | head -1 || echo "")
+    if [ "$NEW_MARKER" != "$CURRENT_MARKER" ]; then
+      # Version mismatch — replace block in-place
+      node -e '
+const fs = require("fs");
+const claudeMd = fs.readFileSync(process.argv[1], "utf8");
+const newBlock = fs.readFileSync(process.argv[2], "utf8");
+const startMarker = "<!-- laminark:instructions:v";
+const endMarker = "<!-- /laminark:instructions -->";
+const startIdx = claudeMd.indexOf(startMarker);
+const endIdx = claudeMd.indexOf(endMarker);
+if (startIdx >= 0 && endIdx >= 0) {
+  const before = claudeMd.slice(0, startIdx);
+  const after = claudeMd.slice(endIdx + endMarker.length);
+  const updated = (before + newBlock + after).replace(/\n{3,}/g, "\n\n").trim() + "\n";
+  fs.writeFileSync(process.argv[1], updated);
+}
+' "$CLAUDE_MD" "$LAMINARK_MD" 2>>"$REPAIR_LOG"
+      log_repair "Updated Laminark instructions in $CLAUDE_MD ($CURRENT_MARKER -> $NEW_MARKER)"
+    fi
+  fi
+fi
+
 cd "$PLUGIN_ROOT"
 exec "$@"

package/plugin/scripts/install.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
-# Install Laminark via npm + MCP server registration
-# Fully standalone — no git clone required.
+# Install Laminark as a Claude Code plugin
+#
+# Installs the npm package globally, registers it as a marketplace,
+# then installs the plugin through the official Claude Code plugin system.
 #
 # Usage: curl -fsSL https://raw.githubusercontent.com/NoobyNull/Laminark/master/plugin/scripts/install.sh | bash
 #   or:  ./plugin/scripts/install.sh
@@ -42,78 +44,118 @@ if [ -n "$CURRENT_VERSION" ]; then
   echo "Reinstalling..."
 fi
 
-# Step 1: Install via npm
+# Step 1: Install via npm (gets the files onto disk)
 echo ""
 echo "Installing laminark globally via npm..."
 npm install -g laminark
 echo "✓ npm package installed"
 
-# Step 2: Register MCP server
-echo ""
-echo "Registering MCP server with Claude Code..."
-claude mcp add-json laminark '{"command":"laminark-server"}' -s user
-echo "✓ MCP server registered"
+# Step 2: Locate the installed package
+NPM_GLOBAL_ROOT=$(npm root -g)
+LAMINARK_ROOT="$NPM_GLOBAL_ROOT/laminark"
 
-# Step 3: Configure hooks in ~/.claude/settings.json
-echo ""
-echo "Configuring hooks..."
-SETTINGS_FILE="${CLAUDE_HOME:-$HOME/.claude}/settings.json"
+if [ ! -d "$LAMINARK_ROOT/plugin" ]; then
+  echo "Error: Plugin directory not found at $LAMINARK_ROOT/plugin"
+  echo "npm install may have failed."
+  exit 1
+fi
 
-node -e '
+NEW_VERSION=$(node -e "console.log(require('$LAMINARK_ROOT/package.json').version)")
+echo "  Version: $NEW_VERSION"
+
+# Step 3: Remove legacy installations
+CLAUDE_HOME="${CLAUDE_HOME:-$HOME/.claude}"
+SETTINGS_FILE="$CLAUDE_HOME/settings.json"
+
+# Remove legacy manual hooks and MCP registrations from settings
+if [ -f "$SETTINGS_FILE" ]; then
+  node -e '
 const fs = require("fs");
-const path = require("path");
 const settingsPath = process.argv[1];
 
-// Ensure directory exists
-fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
-
 let settings = {};
-if (fs.existsSync(settingsPath)) {
-  settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+try { settings = JSON.parse(fs.readFileSync(settingsPath, "utf8")); } catch {}
+
+let changed = false;
+
+// Remove legacy manual hooks
+if (settings.hooks) {
+  for (const [event, entries] of Object.entries(settings.hooks)) {
+    const filtered = entries.filter(entry =>
+      !(entry.hooks && entry.hooks.some(h => h.command && h.command.includes("laminark")))
+    );
+    if (filtered.length !== entries.length) {
+      settings.hooks[event] = filtered;
+      changed = true;
+    }
+    if (settings.hooks[event].length === 0) {
+      delete settings.hooks[event];
+    }
+  }
+  if (Object.keys(settings.hooks).length === 0) {
+    delete settings.hooks;
+  }
 }
 
-if (!settings.hooks) settings.hooks = {};
+// Remove legacy MCP registration (now handled by plugin .mcp.json)
+if (settings.mcpServers && settings.mcpServers.laminark) {
+  delete settings.mcpServers.laminark;
+  if (Object.keys(settings.mcpServers).length === 0) {
+    delete settings.mcpServers;
+  }
+  changed = true;
+}
 
-const hookEvents = {
-  SessionStart: { type: "command", command: "laminark-hook", statusMessage: "Loading Laminark memory context...", timeout: 10 },
-  PreToolUse:   { type: "command", command: "laminark-hook", timeout: 2 },
-  PostToolUse:  { type: "command", command: "laminark-hook", async: true, timeout: 30 },
-  PostToolUseFailure: { type: "command", command: "laminark-hook", async: true, timeout: 30 },
-  Stop:         { type: "command", command: "laminark-hook", async: true, timeout: 15 },
-  SessionEnd:   { type: "command", command: "laminark-hook", async: true, timeout: 15 }
-};
+if (changed) {
+  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+  console.log("✓ Removed legacy hooks/MCP from settings");
+}
+' "$SETTINGS_FILE"
+fi
 
-for (const [event, hookConfig] of Object.entries(hookEvents)) {
-  if (!settings.hooks[event]) settings.hooks[event] = [];
+# Remove legacy MCP server registration
+if claude mcp list 2>/dev/null | grep -q "^laminark:"; then
+  echo "Removing legacy MCP server registration..."
+  claude mcp remove laminark -s user 2>/dev/null || true
+  echo "✓ Legacy MCP registration removed"
+fi
 
-  // Remove any existing laminark hooks, then re-add (ensures up-to-date config)
-  settings.hooks[event] = settings.hooks[event].filter(entry =>
-    !(entry.hooks && entry.hooks.some(h => h.command && h.command.includes("laminark")))
-  );
+# Step 4: Register the npm package as a marketplace source
+echo ""
+echo "Registering laminark marketplace..."
 
-  settings.hooks[event].push({
-    hooks: [hookConfig]
-  });
-}
+# Remove existing marketplace registration to force re-add
+claude plugin marketplace remove laminark 2>/dev/null || true
+claude plugin marketplace add "$LAMINARK_ROOT"
+echo "✓ Marketplace registered"
 
-fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-' "$SETTINGS_FILE"
+# Step 5: Install the plugin via Claude Code's plugin system
+echo ""
+echo "Installing plugin..."
 
-echo "✓ Hooks configured"
+# Uninstall first to avoid conflicts
+claude plugin uninstall laminark@laminark 2>/dev/null || true
+claude plugin install laminark@laminark
+echo "✓ Plugin installed"
+
+# Step 6: CLAUDE.md instructions are auto-provisioned on first MCP server start
+# (handled by ensure-deps.sh — no manual step needed)
 
 # Done
-NEW_VERSION=$(npm list -g laminark --depth=0 2>/dev/null | grep laminark@ | sed 's/.*@//' || echo "unknown")
 echo ""
 echo "✓ Laminark v$NEW_VERSION installed successfully!"
 echo ""
+echo "The plugin system now manages hooks, MCP server, and skills automatically."
+echo ""
 echo "Next steps:"
 echo "  1. Start a new Claude Code session"
-echo "  2. Verify with: /mcp (should show laminark tools)"
+echo "  2. Verify with: /plugin (should show laminark)"
+echo "  3. Check tools with: /mcp (should show laminark tools)"
 
-# Step 4: Recommend GSD (Get Shit Done) workflow plugin
+# Step 7: Recommend GSD (Get Shit Done) workflow plugin
 echo ""
 GSD_INSTALLED=false
-if [ -d "${CLAUDE_HOME:-$HOME/.claude}/commands/gsd" ] || [ -d "${CLAUDE_HOME:-$HOME/.claude}/plugins/gsd" ]; then
+if [ -d "${CLAUDE_HOME}/commands/gsd" ] || [ -d "${CLAUDE_HOME}/plugins/gsd" ] || [ -d "${CLAUDE_HOME}/get-shit-done" ]; then
   GSD_INSTALLED=true
 fi