laminark 2.21.7 → 2.21.9

package/plugin/scripts/uninstall.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Uninstall Laminark plugin with optional data cleanup
+# Uninstall Laminark: remove MCP server, hooks, and npm package
 
 set -e
 
@@ -9,20 +9,24 @@ echo ""
 
 # Check if claude CLI is available
 if ! command -v claude &> /dev/null; then
-  echo "Error: claude CLI not found"
-  echo "Please install Claude Code first: https://claude.com/claude-code"
-  exit 1
+  echo "Warning: claude CLI not found, skipping MCP/hook cleanup"
+  SKIP_CLAUDE=true
 fi
 
-# Check if plugin is installed
-if ! claude plugin list 2>/dev/null | grep -q "laminark"; then
-  echo "Laminark plugin is not installed."
-  exit 0
+# Check what's installed
+NPM_VERSION=$(npm list -g laminark --depth=0 2>/dev/null | grep laminark@ | sed 's/.*@//' || echo "")
+if [ -n "$NPM_VERSION" ]; then
+  echo "npm package: v$NPM_VERSION"
+fi
+
+# Check MCP registration
+if [ "$SKIP_CLAUDE" != "true" ]; then
+  if claude mcp list 2>/dev/null | grep -q "laminark"; then
+    echo "MCP server: registered"
+    MCP_REGISTERED=true
+  fi
 fi
 
-# Get current version
-CURRENT_VERSION=$(claude plugin list 2>/dev/null | grep "laminark" | awk '{print $2}' || echo "unknown")
-echo "Currently installed: laminark v$CURRENT_VERSION"
 echo ""
 
 # Ask for confirmation
@@ -33,42 +37,76 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then
   exit 0
 fi
 
-# Remove the plugin
-echo "Removing plugin..."
-claude plugin remove laminark
-echo "✓ Plugin removed"
+# Step 1: Remove MCP server
+if [ "$MCP_REGISTERED" = "true" ]; then
+  echo ""
+  echo "Removing MCP server..."
+  claude mcp remove laminark -s user 2>/dev/null || true
+  echo "✓ MCP server removed"
+fi
 
-# Ask about data cleanup
+# Step 2: Remove hooks from settings.json
+echo ""
+echo "Removing hooks from settings..."
+SETTINGS_FILE="${CLAUDE_HOME:-$HOME/.claude}/settings.json"
+
+if [ -f "$SETTINGS_FILE" ]; then
+  node -e '
+const fs = require("fs");
+const settingsPath = process.argv[1];
+
+const settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+
+if (settings.hooks) {
+  for (const [event, entries] of Object.entries(settings.hooks)) {
+    settings.hooks[event] = entries.filter(entry =>
+      !(entry.hooks && entry.hooks.some(h => h.command && h.command.includes("laminark")))
+    );
+    // Remove empty arrays
+    if (settings.hooks[event].length === 0) {
+      delete settings.hooks[event];
+    }
+  }
+  // Remove empty hooks object
+  if (Object.keys(settings.hooks).length === 0) {
+    delete settings.hooks;
+  }
+}
+
+// Remove laminark from enabledPlugins if present
+if (settings.enabledPlugins) {
+  for (const key of Object.keys(settings.enabledPlugins)) {
+    if (key.includes("laminark")) {
+      delete settings.enabledPlugins[key];
+    }
+  }
+}
+
+fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+' "$SETTINGS_FILE"
+  echo "✓ Hooks removed"
+fi
+
+# Step 3: Uninstall npm package
+if [ -n "$NPM_VERSION" ]; then
+  echo ""
+  echo "Uninstalling npm package..."
+  npm uninstall -g laminark
+  echo "✓ npm package removed"
+fi
+
+# Step 4: Optional data cleanup
 echo ""
 echo "Data cleanup options:"
 echo "  1. Keep all data (can reinstall later without losing memories)"
-echo "  2. Remove plugin cache only (keeps user data at ~/.laminark/)"
-echo "  3. Remove everything (plugin cache + all memories and data)"
+echo "  2. Remove everything (all memories and data)"
 echo ""
-read -p "Choose option (1-3, default=1): " -n 1 -r CLEANUP_OPTION
+read -p "Choose option (1-2, default=1): " -n 1 -r CLEANUP_OPTION
 echo ""
 
 case $CLEANUP_OPTION in
   2)
-    echo "Removing plugin cache..."
-    CACHE_DIR="${CLAUDE_HOME:-$HOME/.claude}/plugins/cache/laminark"
-    if [ -d "$CACHE_DIR" ]; then
-      rm -rf "$CACHE_DIR"
-      echo "✓ Plugin cache removed: $CACHE_DIR"
-    else
-      echo "  No cache directory found"
-    fi
-    ;;
-  3)
-    echo "Removing all data..."
-    CACHE_DIR="${CLAUDE_HOME:-$HOME/.claude}/plugins/cache/laminark"
     DATA_DIR="$HOME/.laminark"
-
-    if [ -d "$CACHE_DIR" ]; then
-      rm -rf "$CACHE_DIR"
-      echo "✓ Plugin cache removed: $CACHE_DIR"
-    fi
-
     if [ -d "$DATA_DIR" ]; then
       echo ""
       echo "WARNING: This will delete all your memories and observations!"
@@ -90,6 +128,6 @@ esac
 echo ""
 echo "✓ Uninstall complete!"
 echo ""
-echo "To reinstall: ./scripts/local-install.sh or ./scripts/install.sh"
+echo "To reinstall: npm install -g laminark && ./plugin/scripts/install.sh"
 
 exit 0

package/plugin/scripts/update.sh

@@ -1,88 +1,39 @@
 #!/bin/bash
-# Update Laminark plugin to the latest version
+# Update Laminark to the latest version via npm
 
 set -e
 
-echo "Laminark Update Checker"
-echo "======================="
+echo "Laminark Updater"
+echo "================"
 echo ""
 
-# Check if claude CLI is available
-if ! command -v claude &> /dev/null; then
-  echo "Error: claude CLI not found"
-  echo "Please install Claude Code first: https://claude.com/claude-code"
+# Check if npm is available
+if ! command -v npm &> /dev/null; then
+  echo "Error: npm not found"
   exit 1
 fi
 
-# Check if plugin is installed
-if ! claude plugin list 2>/dev/null | grep -q "laminark"; then
-  echo "Laminark is not installed."
-  echo "Run ./scripts/install.sh to install it."
+# Check if installed
+CURRENT_VERSION=$(npm list -g laminark --depth=0 2>/dev/null | grep laminark@ | sed 's/.*@//' || echo "")
+if [ -z "$CURRENT_VERSION" ]; then
+  echo "Laminark is not installed globally."
+  echo "Run: ./plugin/scripts/install.sh"
   exit 1
 fi
 
-# Get current version
-CURRENT_VERSION=$(claude plugin list 2>/dev/null | grep "laminark" | awk '{print $2}' || echo "unknown")
 echo "Currently installed: v$CURRENT_VERSION"
-
-# Check for updates (try to get latest version from GitHub)
-echo "Checking for updates..."
-LATEST_VERSION=$(curl -fsSL https://api.github.com/repos/NoobyNull/Laminark/releases/latest 2>/dev/null | grep '"tag_name"' | sed -E 's/.*"v?([^"]+)".*/\1/' || echo "")
-
-if [ -z "$LATEST_VERSION" ]; then
-  echo "Warning: Could not check for updates (GitHub API unavailable)"
-  echo ""
-  read -p "Force reinstall anyway? (y/N): " -n 1 -r
-  echo ""
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "Update cancelled."
-    exit 0
-  fi
-  FORCE_UPDATE=true
-else
-  echo "Latest available: v$LATEST_VERSION"
-  echo ""
-
-  # Compare versions
-  if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
-    echo "You already have the latest version!"
-    echo ""
-    read -p "Reinstall anyway? (y/N): " -n 1 -r
-    echo ""
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-      echo "Update cancelled."
-      exit 0
-    fi
-  fi
-fi
-
-# Set up TMPDIR to avoid EXDEV errors
-CLAUDE_DIR="${CLAUDE_HOME:-$HOME/.claude}"
-SAFE_TMP="$CLAUDE_DIR/tmp"
-mkdir -p "$SAFE_TMP"
-
-# Reinstall the plugin
 echo ""
-echo "Updating Laminark..."
-TMPDIR="$SAFE_TMP" claude plugin remove laminark 2>/dev/null || true
-TMPDIR="$SAFE_TMP" claude plugin install laminark
-STATUS=$?
-
-# Clean up
-rm -rf "$SAFE_TMP"
+echo "Updating..."
+npm update -g laminark
 
-if [ $STATUS -eq 0 ]; then
-  NEW_VERSION=$(claude plugin list 2>/dev/null | grep "laminark" | awk '{print $2}' || echo "unknown")
-  echo ""
-  echo "✓ Laminark updated successfully!"
-  echo "  Previous version: v$CURRENT_VERSION"
-  echo "  Current version: v$NEW_VERSION"
-  echo ""
-  echo "Restart your Claude Code session for changes to take effect."
+NEW_VERSION=$(npm list -g laminark --depth=0 2>/dev/null | grep laminark@ | sed 's/.*@//' || echo "unknown")
+echo ""
+if [ "$CURRENT_VERSION" = "$NEW_VERSION" ]; then
+  echo "✓ Already at latest version: v$NEW_VERSION"
 else
-  echo ""
-  echo "✗ Update failed with exit code $STATUS"
-  exit $STATUS
+  echo "✓ Updated: v$CURRENT_VERSION → v$NEW_VERSION"
 fi
+echo ""
+echo "Restart your Claude Code session for changes to take effect."
 
 exit 0

package/plugin/scripts/verify-install.sh

@@ -1,43 +1,87 @@
 #!/bin/bash
-# Verify Laminark plugin installation
-# Checks: plugin registered, enabled status, provides next steps
+# Verify Laminark installation
+# Checks: npm global package, MCP server, hooks in settings.json
 
 set -e
 
 echo "Checking Laminark installation..."
 echo ""
 
-# Check if claude CLI is available
+ERRORS=0
+
+# Check 1: npm global package
+NPM_VERSION=$(npm list -g laminark --depth=0 2>/dev/null | grep laminark@ | sed 's/.*@//' || echo "")
+if [ -n "$NPM_VERSION" ]; then
+  echo "✓ npm package: v$NPM_VERSION"
+else
+  # Check for npm link (dev install)
+  if command -v laminark-server &> /dev/null; then
+    echo "✓ laminark-server on PATH (linked)"
+  else
+    echo "✗ npm package not installed"
+    ERRORS=$((ERRORS + 1))
+  fi
+fi
+
+# Check 2: laminark-server binary
+if command -v laminark-server &> /dev/null; then
+  echo "✓ laminark-server binary available"
+else
+  echo "✗ laminark-server not found on PATH"
+  ERRORS=$((ERRORS + 1))
+fi
+
+# Check 3: laminark-hook binary
+if command -v laminark-hook &> /dev/null; then
+  echo "✓ laminark-hook binary available"
+else
+  echo "⚠ laminark-hook not on PATH (hooks may use direct node path)"
+fi
+
+# Check 4: Claude CLI
 if ! command -v claude &> /dev/null; then
-  echo "✗ Error: claude CLI not found"
-  echo "  Please install Claude Code first: https://claude.com/claude-code"
-  exit 1
+  echo "✗ claude CLI not found"
+  ERRORS=$((ERRORS + 1))
+else
+  # Check 5: MCP server registration
+  if claude mcp list 2>/dev/null | grep -q "laminark"; then
+    echo "✓ MCP server registered"
+  else
+    echo "✗ MCP server not registered"
+    echo "  Run: claude mcp add-json laminark '{\"command\":\"laminark-server\"}' -s user"
+    ERRORS=$((ERRORS + 1))
+  fi
 fi
 
-# Check if plugin is registered
-if claude plugin list 2>/dev/null | grep -q "laminark"; then
-  echo "✓ Plugin registered: laminark"
+# Check 6: Hooks in settings.json
+SETTINGS_FILE="${CLAUDE_HOME:-$HOME/.claude}/settings.json"
+if [ -f "$SETTINGS_FILE" ]; then
+  if grep -q "laminark" "$SETTINGS_FILE"; then
+    echo "✓ Hooks configured in settings.json"
+  else
+    echo "✗ No laminark hooks in settings.json"
+    ERRORS=$((ERRORS + 1))
+  fi
 else
-  echo "✗ Plugin not registered"
-  echo "  Please run: ./scripts/local-install.sh"
-  exit 1
+  echo "✗ Settings file not found: $SETTINGS_FILE"
+  ERRORS=$((ERRORS + 1))
 fi
 
-# Check if plugin is enabled
-if claude plugin list 2>/dev/null | grep "laminark" | grep -q "enabled"; then
-  echo "✓ Plugin enabled"
+# Check 7: Data directory
+DATA_DIR="$HOME/.laminark"
+if [ -d "$DATA_DIR" ]; then
+  echo "✓ Data directory exists: $DATA_DIR"
 else
-  echo "⚠ Plugin registered but not enabled"
-  echo "  Run: claude plugin enable laminark"
+  echo "⚠ Data directory not yet created (will be created on first use)"
 fi
 
 echo ""
-echo "Installation verified successfully!"
-echo ""
-echo "Next steps:"
-echo "  1. Start a new Claude Code session"
-echo "  2. Check MCP tools with: /mcp"
-echo "  3. Check hooks with: /hooks"
-echo "  4. Try searching memories with: recall"
+if [ $ERRORS -eq 0 ]; then
+  echo "Installation verified successfully!"
+  echo ""
+  echo "Start a new Claude Code session to use Laminark."
+else
+  echo "Found $ERRORS issue(s). Run ./plugin/scripts/install.sh to fix."
+fi
 
-exit 0
+exit $ERRORS

package/plugin/ui/activity.js

@@ -122,6 +122,12 @@
     var config = EVENT_CONFIG[eventName];
     if (!config) return;
 
+    // Filter out events from other projects
+    if (detail.projectHash && window.laminarkState && window.laminarkState.currentProject &&
+        detail.projectHash !== window.laminarkState.currentProject) {
+      return;
+    }
+
     var item = {
       icon: config.icon,
       label: config.label,
@@ -175,6 +181,12 @@
       });
     });
 
+    // Clear feed when project changes
+    var projectSelect = document.getElementById('project-selector');
+    if (projectSelect) {
+      projectSelect.addEventListener('change', clearFeed);
+    }
+
     renderFeed();
   }
 

package/plugin/ui/app.js

@@ -14,6 +14,7 @@ window.laminarkState = {
   timeline: null,
   graphInitialized: false,
   timelineInitialized: false,
+  toolsInitialized: false,
   currentProject: null,
 };
 
@@ -225,52 +226,30 @@ function connectSSE() {
     recordEventReceived();
   });
 
+  // Helper: dispatch SSE events that belong to the currently selected project.
+  // Events with a mismatched projectHash are dropped; events without projectHash
+  // are allowed through (server may not always tag them, e.g. older builds).
+  function dispatchIfCurrentProject(eventName, data) {
+    if (data.projectHash && data.projectHash !== window.laminarkState.currentProject) return;
+    document.dispatchEvent(new CustomEvent(eventName, { detail: data }));
+  }
+
   eventSource.addEventListener('new_observation', function (e) {
     var data = JSON.parse(e.data);
     recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:new_observation', { detail: data }));
+    dispatchIfCurrentProject('laminark:new_observation', data);
   });
 
   eventSource.addEventListener('entity_updated', function (e) {
     var data = JSON.parse(e.data);
     recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:entity_updated', { detail: data }));
+    dispatchIfCurrentProject('laminark:entity_updated', data);
   });
 
   eventSource.addEventListener('topic_shift', function (e) {
     var data = JSON.parse(e.data);
     recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:topic_shift', { detail: data }));
-  });
-
-  eventSource.addEventListener('session_start', function (e) {
-    var data = JSON.parse(e.data);
-    recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:session_start', { detail: data }));
-  });
-
-  eventSource.addEventListener('session_end', function (e) {
-    var data = JSON.parse(e.data);
-    recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:session_end', { detail: data }));
-  });
-
-  eventSource.addEventListener('path_started', function (e) {
-    var data = JSON.parse(e.data);
-    recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:path_started', { detail: data }));
-  });
-
-  eventSource.addEventListener('path_waypoint', function (e) {
-    var data = JSON.parse(e.data);
-    recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:path_waypoint', { detail: data }));
-  });
-
-  eventSource.addEventListener('path_resolved', function (e) {
-    var data = JSON.parse(e.data);
-    recordEventReceived();
-    document.dispatchEvent(new CustomEvent('laminark:path_resolved', { detail: data }));
+    dispatchIfCurrentProject('laminark:topic_shift', data);
   });
 
   eventSource.onerror = function () {
@@ -319,6 +298,10 @@ async function initProjectSelector() {
 
   select.addEventListener('change', function () {
     window.laminarkState.currentProject = select.value;
+    // Clear any pending batch updates from the previous project
+    if (window.laminarkGraph && window.laminarkGraph.clearBatchQueue) {
+      window.laminarkGraph.clearBatchQueue();
+    }
     // Reload all data for the new project
     if (window.laminarkGraph && window.laminarkState.graphInitialized) {
       window.laminarkGraph.loadGraphData();
@@ -383,6 +366,11 @@ function initNavigation() {
           window.laminarkGraph.loadGraphData();
           window.laminarkState.graphInitialized = true;
         }
+      } else if (targetView === 'tools-view' && !window.laminarkState.toolsInitialized) {
+        if (window.laminarkTools) {
+          window.laminarkTools.initTools('tools-view');
+          window.laminarkState.toolsInitialized = true;
+        }
       }
     });
   });
@@ -1481,7 +1469,8 @@ document.addEventListener('DOMContentLoaded', async function () {
   document.addEventListener('laminark:entity_updated', function (e) {
     if (!window.laminarkGraph) return;
     var data = e.detail;
-    if (data && data.id) {
+    // Only add entities belonging to the currently selected project
+    if (data && data.id && data.projectHash && data.projectHash === window.laminarkState.currentProject) {
       window.laminarkGraph.queueBatchUpdate({
         type: 'addNode',
         data: {
@@ -1496,32 +1485,13 @@ document.addEventListener('DOMContentLoaded', async function () {
   });
 
   document.addEventListener('laminark:new_observation', function () {
-    // Refresh observation counts by reloading graph data
+    // Refresh observation counts by reloading graph data (already project-filtered at SSE dispatch)
     if (window.laminarkGraph) {
       var filters = getActiveFilters();
       window.laminarkGraph.loadGraphData(filters ? { type: filters.join(',') } : undefined);
     }
   });
 
-  // Path overlay event handlers (Plan 02 adds the graph overlay functions)
-  document.addEventListener('laminark:path_started', function (e) {
-    if (window.laminarkGraph && window.laminarkGraph.addPathOverlay) {
-      window.laminarkGraph.addPathOverlay(e.detail);
-    }
-  });
-
-  document.addEventListener('laminark:path_waypoint', function (e) {
-    if (window.laminarkGraph && window.laminarkGraph.updatePathOverlay) {
-      window.laminarkGraph.updatePathOverlay(e.detail);
-    }
-  });
-
-  document.addEventListener('laminark:path_resolved', function (e) {
-    if (window.laminarkGraph && window.laminarkGraph.resolvePathOverlay) {
-      window.laminarkGraph.resolvePathOverlay(e.detail);
-    }
-  });
-
   // Filter change handler for graph (legacy listener)
   document.addEventListener('laminark:filter_change', function () {
     // Filter changes now handled directly in initFilters via graph.filterByType/resetFilters