@ulpi/codemap 0.3.11 → 0.3.12

package/README.md

@@ -111,6 +111,35 @@ codemap watch --debounce 500
 |--------|-------------|---------|
 | `--debounce <ms>` | Debounce interval | `300` |
 
+### `codemap statusline`
+
+Install a CodeMap status indicator into Claude Code's statusline. It extends your existing statusline (if any) and appends CodeMap info.
+
+```bash
+codemap statusline              # Install
+codemap statusline --uninstall  # Remove and restore previous statusline
+```
+
+The statusline shows at a glance:
+
+```
+MyProject | git:main | Opus (1M context) | ctx:8%
+CodeMap: ● 842 files · ◆12.4k chunks | 23m ago
+```
+
+With multiple codemap MCP servers registered in `.mcp.json`, each gets its own line:
+
+```
+MyProject | git:main | Opus (1M context) | ctx:8%
+CodeMap: ● 842 files · ◆12.4k chunks | 23m ago
+CodeMap (frontend): ○ 360 files · ◆1.9k chunks · ⚠3 stale | 2h ago
+```
+
+- **●/○** — `codemap watch` running or not
+- **◆** — indexed chunks (search units)
+- **⚠N stale** — files modified since last index
+- **IDX** — indexing in progress
+
 ### `codemap deps <file>`
 
 Show files this file depends on (outgoing imports).

package/dist/index.js

@@ -6137,14 +6137,24 @@ function registerIndex(program2) {
     console.log(chalk4.bold("Indexing ") + chalk4.cyan(projectDir));
     console.log(chalk4.dim(`Branch: ${branch} | Provider: ${config.embedding.provider} | Model: ${config.embedding.model}`));
     console.log();
-    const stats = await runInitPipeline(projectDir, config, {
-      branch,
-      dataDir: getDataDir2(),
-      onProgress: (progress) => {
-        const pct = progress.total ? ` (${progress.current ?? 0}/${progress.total})` : "";
-        console.log(chalk4.dim(`[${progress.phase}]`) + ` ${progress.message}${pct}`);
+    let stats;
+    try {
+      stats = await runInitPipeline(projectDir, config, {
+        branch,
+        dataDir: getDataDir2(),
+        onProgress: (progress) => {
+          const pct = progress.total ? ` (${progress.current ?? 0}/${progress.total})` : "";
+          console.log(chalk4.dim(`[${progress.phase}]`) + ` ${progress.message}${pct}`);
+        }
+      });
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("Failed to acquire codemap lock")) {
+        console.log(chalk4.yellow("Another codemap process is already indexing this project."));
+        console.log(chalk4.dim("Wait for it to finish, or run `codemap status` to check."));
+        return;
       }
-    });
+      throw err;
+    }
     console.log();
     console.log(chalk4.green("Index complete:"));
     console.log(`  Files:  ${stats.totalFiles}`);
@@ -7051,7 +7061,11 @@ import { homedir as homedir3 } from "os";
 function buildStatuslineScript(originalCommand) {
   const escapedCmd = originalCommand.replace(/'/g, "'\\''");
   const originalSection = originalCommand ? `ORIGINAL_CMD='${escapedCmd}'
-echo "$SESSION_JSON" | eval "$ORIGINAL_CMD" 2>/dev/null || true` : "# (none)";
+original_out=$(echo "$SESSION_JSON" | eval "$ORIGINAL_CMD" 2>/dev/null || true)
+if [ -n "$original_out" ]; then
+  echo "$original_out"
+  has_line1=true
+fi` : "";
   return `#!/bin/bash
 # CodeMap statusline for Claude Code
 # Generated by: codemap statusline
@@ -7062,34 +7076,49 @@ set -euo pipefail
 # Read session JSON from stdin (Claude Code pipes it)
 SESSION_JSON=$(cat)
 
-# --- Original statusline ---
+has_line1=false
+
+# --- Original statusline command (if any) ---
 ${originalSection}
 
-# --- CodeMap status ---
-# Resolve the working directory from session JSON
+# --- Reconstruct Claude Code default status (line 1) ---
 current_dir=$(echo "$SESSION_JSON" | ${jsonExtract("cwd")} 2>/dev/null || pwd)
 
-# Run codemap status --json for the project directory
-cm_json=$(codemap status --json --cwd "$current_dir" 2>/dev/null || true)
+if [ "$has_line1" = "false" ]; then
+  project_name=$(basename "$current_dir")
+  git_branch=$(cd "$current_dir" && git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+  model_display=$(echo "$SESSION_JSON" | ${jsonExtract("display_name")} 2>/dev/null || echo "")
+  ctx_size=$(echo "$SESSION_JSON" | ${jsonExtract("context_window_size")} 2>/dev/null || echo "")
+  ctx_label=""
+  if [ -n "$ctx_size" ]; then
+    if [ "$ctx_size" -ge 1000000 ] 2>/dev/null; then
+      ctx_label="1M context"
+    elif [ "$ctx_size" -ge 100000 ] 2>/dev/null; then
+      ctx_label="200k context"
+    fi
+  fi
+  ctx_pct=$(echo "$SESSION_JSON" | ${jsonExtract("used_percentage")} 2>/dev/null || echo "")
 
-if [ -z "$cm_json" ]; then
-  exit 0
-fi
+  line1="$project_name"
+  if [ -n "$git_branch" ]; then
+    line1="\${line1} | git:$git_branch"
+  fi
+  if [ -n "$model_display" ]; then
+    if [ -n "$ctx_label" ]; then
+      line1="\${line1} | \${model_display} (\${ctx_label})"
+    else
+      line1="\${line1} | \${model_display}"
+    fi
+  fi
+  if [ -n "$ctx_pct" ]; then
+    line1="\${line1} | ctx:\${ctx_pct}%"
+  fi
 
-# Parse fields
-stats_null=$(echo "$cm_json" | ${jsonExtract("stats")} 2>/dev/null || echo "null")
-if [ "$stats_null" = "null" ] || [ -z "$stats_null" ]; then
-  echo "CM: \u2014 no index (run: codemap index)"
-  exit 0
+  echo "$line1"
 fi
 
-total_files=$(echo "$cm_json" | ${jsonPath("stats", "totalFiles")} 2>/dev/null || echo "0")
-total_chunks=$(echo "$cm_json" | ${jsonPath("stats", "totalChunks")} 2>/dev/null || echo "0")
-stale_files=$(echo "$cm_json" | ${jsonPath("stats", "staleFiles")} 2>/dev/null || echo "0")
-last_updated=$(echo "$cm_json" | ${jsonPath("stats", "lastUpdated")} 2>/dev/null || echo "")
-indexing=$(echo "$cm_json" | ${jsonExtract("indexing")} 2>/dev/null || echo "false")
+# --- Helper functions ---
 
-# Format chunks (e.g. 12400 \u2192 12.4k)
 format_chunks() {
   local n=$1
   if [ "$n" -ge 1000 ]; then
@@ -7102,7 +7131,6 @@ format_chunks() {
   fi
 }
 
-# Calculate time ago
 time_ago() {
   local updated="$1"
   if [ -z "$updated" ]; then
@@ -7112,7 +7140,6 @@ time_ago() {
   local now
   now=$(date +%s)
   local then_ts
-  # macOS date -j vs GNU date
   if date -j -f "%Y-%m-%dT%H:%M:%S" "$(echo "$updated" | cut -c1-19)" +%s >/dev/null 2>&1; then
     then_ts=$(date -j -f "%Y-%m-%dT%H:%M:%S" "$(echo "$updated" | cut -c1-19)" +%s 2>/dev/null || echo "$now")
   else
@@ -7130,36 +7157,104 @@ time_ago() {
   fi
 }
 
-# Watcher detection
-watcher_icon="\u25CB"
-if pgrep -f "codemap watch" >/dev/null 2>&1; then
-  watcher_icon="\u25CF"
-fi
+# Print one CodeMap status line for a given project directory and label
+print_codemap_status() {
+  local label="$1"
+  local target_dir="$2"
 
-# Indexing indicator
-idx_icon=""
-if [ "$indexing" = "true" ]; then
-  idx_icon=" IDX"
-fi
+  local cm_json
+  cm_json=$(codemap status --json --cwd "$target_dir" 2>/dev/null || true)
+  if [ -z "$cm_json" ]; then
+    return
+  fi
 
-chunks_fmt=$(format_chunks "$total_chunks")
+  local stats_null
+  stats_null=$(echo "$cm_json" | ${jsonExtract("stats")} 2>/dev/null || echo "null")
+  if [ "$stats_null" = "null" ] || [ -z "$stats_null" ]; then
+    echo "\${label} \u2014 no index (run: codemap index)"
+    return
+  fi
 
-# Build status line
-line="CM: \${watcher_icon} \${total_files}f \${chunks_fmt}\u25C6"
+  local total_files total_chunks stale_files last_updated indexing
+  total_files=$(echo "$cm_json" | ${jsonPath("stats", "totalFiles")} 2>/dev/null || echo "0")
+  total_chunks=$(echo "$cm_json" | ${jsonPath("stats", "totalChunks")} 2>/dev/null || echo "0")
+  stale_files=$(echo "$cm_json" | ${jsonPath("stats", "staleFiles")} 2>/dev/null || echo "0")
+  last_updated=$(echo "$cm_json" | ${jsonPath("stats", "lastUpdated")} 2>/dev/null || echo "")
+  indexing=$(echo "$cm_json" | ${jsonExtract("indexing")} 2>/dev/null || echo "false")
 
-if [ "$stale_files" -gt 0 ] 2>/dev/null; then
-  line="\${line} \u26A0\${stale_files}"
-fi
+  local watcher_icon="\u25CB"
+  if pgrep -f "codemap watch" >/dev/null 2>&1; then
+    watcher_icon="\u25CF"
+  fi
+
+  local idx_icon=""
+  if [ "$indexing" = "true" ]; then
+    idx_icon=" \xB7 IDX"
+  fi
+
+  local chunks_fmt
+  chunks_fmt=$(format_chunks "$total_chunks")
+
+  local line="\${label} \${watcher_icon} \${total_files} files \xB7 \u25C6\${chunks_fmt} chunks"
+
+  if [ "$stale_files" -gt 0 ] 2>/dev/null; then
+    line="\${line} \xB7 \u26A0\${stale_files} stale"
+  fi
+
+  line="\${line}\${idx_icon} | $(time_ago "$last_updated")"
+
+  echo "$line"
+}
 
-line="\${line}\${idx_icon} | $(time_ago "$last_updated")"
+# --- CodeMap status lines ---
 
-echo "$line"
+# Discover codemap MCP servers from .mcp.json
+mcp_file="$current_dir/.mcp.json"
+found_servers=false
+
+if [ -f "$mcp_file" ]; then
+  # Use node to reliably parse JSON \u2014 extract "name|cwd" pairs for codemap servers
+  codemap_servers=$(node -e "
+    const fs = require('fs');
+    try {
+      const mcp = JSON.parse(fs.readFileSync(process.argv[1], 'utf-8'));
+      const servers = mcp.mcpServers || {};
+      for (const [name, config] of Object.entries(servers)) {
+        if (config.command !== 'codemap') continue;
+        const args = config.args || [];
+        const cwdIdx = args.indexOf('--cwd');
+        const cwd = cwdIdx >= 0 && cwdIdx + 1 < args.length ? args[cwdIdx + 1] : '';
+        console.log(name + '|' + cwd);
+      }
+    } catch {}
+  " "$mcp_file" 2>/dev/null || true)
+
+  if [ -n "$codemap_servers" ]; then
+    found_servers=true
+    while IFS='|' read -r server_name server_cwd; do
+      target_dir="\${server_cwd:-$current_dir}"
+      # Derive label: "codemap" \u2192 "CodeMap:", "codemap-frontend" \u2192 "CodeMap (frontend):"
+      suffix=$(echo "$server_name" | sed 's/^codemap-//' | sed 's/^codemap$//')
+      if [ -n "$suffix" ]; then
+        label="CodeMap (\${suffix}):"
+      else
+        label="CodeMap:"
+      fi
+      print_codemap_status "$label" "$target_dir"
+    done <<< "$codemap_servers"
+  fi
+fi
+
+# Fallback: no .mcp.json or no codemap entries \u2014 show status for current dir
+if [ "$found_servers" = "false" ]; then
+  print_codemap_status "CodeMap:" "$current_dir"
+fi
 `;
 }
 function jsonExtract(field) {
   return `grep -o '"${field}"[[:space:]]*:[[:space:]]*[^,}]*' | sed 's/.*:[[:space:]]*//' | sed 's/"//g' | head -1`;
 }
-function jsonPath(parent, child) {
+function jsonPath(_parent, child) {
   return `grep -o '"${child}"[[:space:]]*:[[:space:]]*[^,}]*' | sed 's/.*:[[:space:]]*//' | sed 's/"//g' | head -1`;
 }
 
@@ -7221,11 +7316,16 @@ function install() {
     console.log(chalk17.dim("Your existing statusline is preserved \u2014 CodeMap appends to it."));
   }
   console.log();
-  console.log("CodeMap will append to the statusline:");
-  console.log(chalk17.cyan("  CM: \u25CF 842f 12.4k\u25C6 | 23m ago") + chalk17.dim("       \u2014 watcher running, index fresh"));
-  console.log(chalk17.cyan("  CM: \u25CB 842f 12.4k\u25C6 \u26A03 | 2h ago") + chalk17.dim("    \u2014 no watcher, 3 stale files"));
-  console.log(chalk17.cyan("  CM: \u25CB 842f 12.4k\u25C6 IDX | 5s ago") + chalk17.dim("   \u2014 indexing in progress"));
-  console.log(chalk17.cyan("  CM: \u2014 no index (run: codemap index)") + chalk17.dim("  \u2014 not yet indexed"));
+  console.log("The statusline will show:");
+  console.log();
+  console.log("  " + chalk17.cyan("MyProject | git:main | Opus (1M context) | ctx:8%"));
+  console.log("  " + chalk17.cyan("CodeMap: \u25CF 842 files \xB7 \u25C612.4k chunks | 23m ago"));
+  console.log();
+  console.log("  With multiple codemap MCP servers:");
+  console.log();
+  console.log("  " + chalk17.cyan("MyProject | git:main | Opus (1M context) | ctx:8%"));
+  console.log("  " + chalk17.cyan("CodeMap: \u25CF 842 files \xB7 \u25C612.4k chunks | 23m ago"));
+  console.log("  " + chalk17.cyan("CodeMap (frontend): \u25CB 360 files \xB7 \u25C61.9k chunks \xB7 \u26A03 stale | 2h ago"));
   console.log();
   console.log(chalk17.dim("Restart Claude Code to see the statusline."));
   console.log(chalk17.dim("Run `codemap statusline --uninstall` to remove."));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ulpi/codemap",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "type": "module",
   "description": "Standalone code intelligence CLI — hybrid vector + BM25 search, dependency analysis, PageRank",
   "bin": {