@massa-ai/claude-plugin 1.7.0 → 1.8.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "massa-ai",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "massa-ai — semantic code search, durable memory, symbol graph, and context compression",
   "author": {
     "name": "Luiz Massa",

package/hooks/massa-ai-hook.ts

@@ -29,6 +29,7 @@
 
 import { spawnSync } from "child_process";
 import { readFileSync, writeFileSync, mkdirSync, existsSync, fstatSync } from "fs";
+import { homedir } from "os";
 import path from "path";
 
 // ── Event type mapping ──────────────────────────────────────────────────────
@@ -132,6 +133,60 @@ export function readStdin(): string {
   }
 }
 
+// ── API key resolution (SEC-06) ─────────────────────────────────────────────
+
+/**
+ * Path to the runtime config file, resolved the same way
+ * `packages/shared/src/config/xdg.ts` resolves it: `XDG_CONFIG_HOME` when set
+ * and non-blank, else `~/.config`.
+ *
+ * Duplicated rather than imported on purpose. This binary's entire dependency
+ * surface is `child_process`/`fs`/`os`/`path`; pulling in `@massa-ai/shared`
+ * would drag the config loader, its Prisma-adjacent transitive graph, and its
+ * startup cost into a process that runs on every single tool call and is
+ * budgeted in milliseconds. The duplication is nine lines and is pinned by
+ * tests on both sides.
+ */
+export function getHookConfigPath(): string {
+  const xdg = process.env.XDG_CONFIG_HOME;
+  const base = xdg && xdg.trim() ? xdg : path.join(homedir(), ".config");
+  return path.join(base, "massa-ai", "config.json");
+}
+
+/**
+ * Resolve the Tools API key: `MASSA_AI_API_KEY` → `config.json`
+ * `security.apiKey` → none. Returns "" when no key is available.
+ *
+ * SEC-01 auto-provisions the key into config.json on first API start, and this
+ * binary never runs the `env.ts` seeding that puts it in the environment for
+ * everything else — so without reading the file it would send unauthenticated
+ * POSTs forever. Because the hook silent-degrades by contract, that failure
+ * has no symptom: observation capture just stops.
+ *
+ * Whitespace-only values count as unset, matching `usable()` in
+ * `packages/shared/src/config/api-key.ts`. Every failure mode (missing file,
+ * unreadable, malformed JSON, wrong shape) degrades to "" rather than throwing:
+ * a hook must never block the agent.
+ *
+ * Deliberately not memoised. A hook process handles exactly one event and
+ * exits, so there is no second call to amortise, and a module-level cache would
+ * make the resolution untestable without a reset seam.
+ */
+export function resolveHookApiKey(): string {
+  const fromEnv = process.env.MASSA_AI_API_KEY;
+  if (fromEnv && fromEnv.trim()) return fromEnv.trim();
+
+  try {
+    const parsed = JSON.parse(readFileSync(getHookConfigPath(), "utf8"));
+    const stored = parsed?.security?.apiKey;
+    if (typeof stored === "string" && stored.trim()) return stored.trim();
+  } catch {
+    // Missing, unreadable, or malformed config → no key (silent-degrade).
+  }
+
+  return "";
+}
+
 // ── POST helper ─────────────────────────────────────────────────────────────
 
 export function postObservation(
@@ -149,7 +204,7 @@ export function postObservation(
     const headers: Record<string, string> = {
       "Content-Type": "application/json",
     };
-    const apiKey = process.env.MASSA_AI_API_KEY;
+    const apiKey = resolveHookApiKey();
     if (apiKey) {
       headers["x-api-key"] = apiKey;
     }

package/install.sh

@@ -12,6 +12,18 @@
 # MCP registration is delegated to scripts/install-agents.sh, the single writer
 # of host MCP config; it merges the massa-ai entry alongside the hooks block.
 #
+# Plugin-registry registration is delegated to the `claude` CLI, which owns the
+# format of known_marketplaces.json / installed_plugins.json / settings.json's
+# enabledPlugins. Writing those files by hand is what this installer used to
+# omit entirely, which is why the plugin never appeared in /plugin despite the
+# files above all being written correctly.
+#
+# The two routes are mutually exclusive by construction. When the CLI route
+# succeeds, the plugin bundle supplies commands, agents and hooks/hooks.json
+# itself, so this script removes its own loose copies instead of adding them —
+# otherwise every lifecycle event fires twice and every command appears twice.
+# When the CLI is absent or too old, the file route runs exactly as before.
+#
 # Idempotent: re-running is a no-op when owned hooks already present.
 # Uninstall removes only ownership-marked hook entries + commands/agents,
 # preserving user keys and user hooks.
@@ -27,9 +39,15 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+# shellcheck source=scripts/lib/installer-shared.sh
+source "$REPO_ROOT/scripts/lib/installer-shared.sh"
 SCOPE="user"
 UNINSTALL=0
 DRY_RUN=0
+# The marketplace root to register. install-harness.sh resolves this once for
+# the whole run (--plugin-source local|copy|auto); a direct invocation of this
+# script defaults to the checkout it lives in.
+PLUGIN_SOURCE_ROOT="${MASSA_AI_PLUGIN_SOURCE_ROOT:-$REPO_ROOT}"
 
 for arg in "$@"; do
   case "$arg" in
@@ -323,9 +341,72 @@ try {
 NODE
 }
 
+# ── Plugin-registry registration (delegated to the claude CLI) ──────────────
+# The CLI owns the registry format, so it is the only supported way to make the
+# plugin appear in /plugin. Every failure path returns non-zero and the caller
+# falls back to the file route: a missing CLI, a build too old for
+# `plugin marketplace add`, or an unrelated binary named `claude` must degrade,
+# never abort. Scope is deliberately absent — Claude Code records plugin
+# installs at user scope even for --project, the same reason PLUGIN_REGISTRY
+# resolves from $HOME.
+PLUGIN_MARKETPLACE="massa-ai"
+PLUGIN_ID="massa-ai@massa-ai"
+
+claude_plugin_registered() {
+  [[ -f "$PLUGIN_REGISTRY" ]] || return 1
+  grep -q '"massa-ai@' "$PLUGIN_REGISTRY" 2>/dev/null
+}
+
+register_claude_plugin() {
+  # Explicit opt-out. Also what pins the file-route tests to the file route:
+  # without it the suite's outcome would depend on whether the machine running
+  # it happens to have the claude CLI installed.
+  [[ "${MASSA_AI_SKIP_PLUGIN_REGISTRY:-0}" == "1" ]] && return 1
+  installer_host_cli_supports claude plugin marketplace || return 1
+  if [[ ! -f "$PLUGIN_SOURCE_ROOT/.claude-plugin/marketplace.json" ]]; then
+    vecho "  – no marketplace manifest under $PLUGIN_SOURCE_ROOT — keeping file route"
+    return 1
+  fi
+  # Both subcommands are idempotent: a second run reports "already on disk" /
+  # "already installed" and exits 0, leaving the registry files byte-identical.
+  claude plugin marketplace add "$PLUGIN_SOURCE_ROOT" </dev/null >/dev/null 2>&1 || return 1
+  claude plugin install "$PLUGIN_ID" </dev/null >/dev/null 2>&1 || return 1
+  claude_plugin_registered
+}
+
+unregister_claude_plugin() {
+  installer_host_cli_supports claude plugin marketplace || return 0
+  claude plugin uninstall "$PLUGIN_ID" </dev/null >/dev/null 2>&1 || true
+  claude plugin marketplace remove "$PLUGIN_MARKETPLACE" </dev/null >/dev/null 2>&1 || true
+}
+
+# Strip artifacts a previous file-route install left behind. Called on the
+# plugin route, where the bundle supplies all three itself. Without this an
+# upgrading user keeps their old loose commands and merged hooks *and* gains
+# the plugin's copies — double-firing every lifecycle event, which is the exact
+# bug the guard inside merge_settings_hooks exists to prevent.
+remove_file_route_artifacts() {
+  if [[ -f "$SETTINGS_JSON" ]]; then
+    merge_settings_hooks "$SETTINGS_JSON" "uninstall"
+  fi
+  if [[ -d "$TARGET/commands" ]]; then
+    for src in "$SCRIPT_DIR/commands/"*.md; do
+      [[ -f "$src" ]] || continue
+      rm -f "$TARGET/commands/massa-ai-$(basename "$src" .md).md"
+    done
+  fi
+  if [[ -d "$TARGET/agents" ]]; then
+    for src in "$TARGET/agents/"massa-ai-*.md; do
+      [[ -f "$src" ]] || continue
+      rm -f "$src"
+    done
+  fi
+}
+
 # ── Uninstall ───────────────────────────────────────────────────────────────
 if [[ "$UNINSTALL" -eq 1 ]]; then
   echo "Uninstalling massa-ai Claude Code plugin (scope: $SCOPE)..."
+  unregister_claude_plugin
   uninstall_bundled_skills
   # Remove owned hook entries (preserves user hooks + user keys)
   if [[ -f "$SETTINGS_JSON" ]]; then
@@ -357,30 +438,53 @@ fi
 
 # ── Install ──────────────────────────────────────────────────────────────────
 vecho "Installing massa-ai Claude Code plugin to: $TARGET"
-mkdir -p "$TARGET/commands" "$TARGET/agents"
 
-# Count for summary
-command_count=0
-# Slash commands — prefix with 'massa-ai-' to avoid collisions with user commands
-for src in "$SCRIPT_DIR/commands/"*.md; do
-  name="$(basename "$src" .md)"
-  dest="$TARGET/commands/massa-ai-${name}.md"
-  cp "$src" "$dest"
-  vecho "  + /massa-ai-${name}"
-  command_count=$((command_count + 1))
-done
+# Route selection. The plugin route is preferred because it is the only one
+# that puts massa-ai in /plugin; the file route remains the fallback so a host
+# without a usable `claude` CLI still gets a working install.
+PLUGIN_ROUTE=0
+if register_claude_plugin; then
+  PLUGIN_ROUTE=1
+fi
 
-# Subagent specialists (generated from skills/agents/*/SKILL.md, navigator
-# included). The massa-ai- name prefix is the ownership marker used by uninstall.
+command_count=0
 specialist_count=0
-for src in "$SCRIPT_DIR/agents/"massa-ai-*.md; do
-  [[ -f "$src" ]] || continue
-  name="$(basename "$src")"
-  cp "$src" "$TARGET/agents/$name"
-  vecho "  + $name"
-  specialist_count=$((specialist_count + 1))
-done
-vecho "  + ${specialist_count} subagent specialists (generated from skills/agents/*/SKILL.md)"
+
+if [[ "$PLUGIN_ROUTE" -eq 1 ]]; then
+  # The bundle at $PLUGIN_SOURCE_ROOT/apps/claude-plugin already carries these,
+  # so counting them keeps the summary honest without copying anything.
+  for src in "$SCRIPT_DIR/commands/"*.md; do
+    [[ -f "$src" ]] && command_count=$((command_count + 1))
+  done
+  for src in "$SCRIPT_DIR/agents/"massa-ai-*.md; do
+    [[ -f "$src" ]] && specialist_count=$((specialist_count + 1))
+  done
+  remove_file_route_artifacts
+  vecho "  + registered ${PLUGIN_ID} (marketplace root: ${PLUGIN_SOURCE_ROOT})"
+  vecho "  + commands, subagents and hooks now served by the plugin bundle"
+else
+  mkdir -p "$TARGET/commands" "$TARGET/agents"
+
+  # Slash commands — prefix with 'massa-ai-' to avoid collisions with user commands
+  for src in "$SCRIPT_DIR/commands/"*.md; do
+    name="$(basename "$src" .md)"
+    dest="$TARGET/commands/massa-ai-${name}.md"
+    cp "$src" "$dest"
+    vecho "  + /massa-ai-${name}"
+    command_count=$((command_count + 1))
+  done
+
+  # Subagent specialists (generated from skills/agents/*/SKILL.md, navigator
+  # included). The massa-ai- name prefix is the ownership marker used by uninstall.
+  for src in "$SCRIPT_DIR/agents/"massa-ai-*.md; do
+    [[ -f "$src" ]] || continue
+    name="$(basename "$src")"
+    cp "$src" "$TARGET/agents/$name"
+    vecho "  + $name"
+    specialist_count=$((specialist_count + 1))
+  done
+  vecho "  + ${specialist_count} subagent specialists (generated from skills/agents/*/SKILL.md)"
+fi
 
 # Skills bundling (PDO-08, 09): install massa-ai/persona-router into the
 # shared harness skills directory, unless scripts/install-skills.sh already
@@ -388,15 +492,19 @@ vecho "  + ${specialist_count} subagent specialists (generated from skills/agent
 vecho ""
 install_bundled_skills
 
-# Merge hooks into settings.json (array-append, backup, idempotent)
-vecho ""
-vecho "Merging hooks into $SETTINGS_JSON..."
-if [[ ! -f "$HOOK_BIN" ]]; then
-  echo "  ⚠ Warning: hook binary not found at $HOOK_BIN" >&2
-  echo "    Hooks will not fire until the binary is available." >&2
+# Merge hooks into settings.json (array-append, backup, idempotent).
+# Skipped on the plugin route, where hooks/hooks.json inside the bundle is
+# already wired by Claude Code itself.
+if [[ "$PLUGIN_ROUTE" -eq 0 ]]; then
+  vecho ""
+  vecho "Merging hooks into $SETTINGS_JSON..."
+  if [[ ! -f "$HOOK_BIN" ]]; then
+    echo "  ⚠ Warning: hook binary not found at $HOOK_BIN" >&2
+    echo "    Hooks will not fire until the binary is available." >&2
+  fi
+  merge_settings_hooks "$SETTINGS_JSON" "install"
+  vecho "  + 5 massa-ai hook events wired (array-append, user hooks preserved)"
 fi
-merge_settings_hooks "$SETTINGS_JSON" "install"
-vecho "  + 5 massa-ai hook events wired (array-append, user hooks preserved)"
 
 # ── MCP registration (delegated) ─────────────────────────────────────────────
 # scripts/install-agents.sh is the single writer of host MCP config. It merges
@@ -421,7 +529,13 @@ fi
 
 # Summary line in quiet mode
 if [ "${MASSA_AI_VERBOSE:-0}" != "1" ]; then
-  ok "claude plugin installed (${command_count} commands, ${specialist_count} specialists, 5 hooks)"
+  if [[ "$PLUGIN_ROUTE" -eq 1 ]]; then
+    ok "claude plugin registered (${command_count} commands, ${specialist_count} specialists, 5 hooks) — shows in /plugin"
+  else
+    ok "claude plugin installed (${command_count} commands, ${specialist_count} specialists, 5 hooks)"
+    warn "claude CLI unavailable — not registered in /plugin. Register it with:"
+    warn "  claude plugin marketplace add \"$PLUGIN_SOURCE_ROOT\" && claude plugin install $PLUGIN_ID"
+  fi
 else
   vecho ""
   vecho "Done. Restart Claude Code to pick up the new commands and hooks."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@massa-ai/claude-plugin",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "massa-ai plugin for Claude Code — semantic code search, durable memory, symbol graph, and context compression",
   "files": [
     "agents",