composto-ai 0.6.1 → 0.7.1

package/dist/index.js

@@ -843,8 +843,9 @@ function emitTier1(node) {
   const outPrefix = exported ? "OUT " : "";
   switch (node.type) {
     case "import_statement": {
-      const text = collapseText(node.text, 80);
-      return `USE:${text}`;
+      const source = node.childForFieldName("source")?.text;
+      if (source) return `USE:${source.slice(1, -1)}`;
+      return `USE:${collapseText(node.text, 80)}`;
     }
     case "function_declaration": {
       const name = node.childForFieldName("name")?.text ?? "anonymous";
@@ -974,9 +975,30 @@ function emitTier3(node) {
         }
         if (node.parent?.type === "statement_block") return null;
         const vt = value.type;
-        if (vt === "number" || vt === "true" || vt === "false") return null;
-        if (vt === "object" || vt === "array") return null;
-        if (vt === "new_expression" || vt === "call_expression") return null;
+        if (vt === "number" || vt === "true" || vt === "false") {
+          return `VAR:${name} = ${value.text}`;
+        }
+        if (vt === "array") {
+          return `VAR:${name}[${value.namedChildCount}]`;
+        }
+        if (vt === "object") {
+          const keys = [];
+          for (let i = 0; i < value.namedChildCount; i++) {
+            const member = value.namedChild(i);
+            keys.push(member.childForFieldName("key")?.text ?? member.text);
+            if (keys.length >= 6) break;
+          }
+          const more = value.namedChildCount > keys.length ? ", ..." : "";
+          return `VAR:${name}{${collapseText(keys.join(", "), 50)}${more}}`;
+        }
+        if (vt === "new_expression") {
+          const ctor = value.childForFieldName("constructor")?.text ?? "?";
+          return `VAR:${name} = new ${ctor}(...)`;
+        }
+        if (vt === "call_expression") {
+          const callee = value.childForFieldName("function")?.text ?? "?";
+          return `VAR:${name} = ${collapseText(callee, 40)}(...)`;
+        }
         const valText = value.text.replace(/"[^"]*"/g, '""').replace(/'[^']*'/g, "''").replace(/`[^`]*`/g, "``");
         return `VAR:${name} = ${collapseText(valText, 50)}`;
       }
@@ -1137,29 +1159,27 @@ async function astWalkIR(code, filePath) {
   }
   const merged = [];
   let guardBlock = [];
+  const guardValue = (ret) => ret.replace(/^RET\s+/, "");
+  const flushGuards = () => {
+    if (guardBlock.length === 0) return;
+    if (guardBlock.length < 3) {
+      for (const g of guardBlock) merged.push(`${g.indent}IF:${g.cond} \u2192 ${g.ret}`);
+    } else {
+      const entries = guardBlock.map((g) => `${g.cond} \u2192 ${guardValue(g.ret)}`);
+      merged.push(`${guardBlock[0].indent}GUARD:[${entries.join(", ")}]`);
+    }
+    guardBlock = [];
+  };
   for (const line of pass1) {
-    const guardMatch = line.match(/^(\s*)IF:(.+?) \u2192 RET/);
+    const guardMatch = line.match(/^(\s*)IF:(.+?) \u2192 (.+)$/);
     if (guardMatch) {
-      guardBlock.push(guardMatch[2].trim());
+      guardBlock.push({ indent: guardMatch[1], cond: guardMatch[2].trim(), ret: guardMatch[3].trim() });
       continue;
     }
-    if (guardBlock.length > 0) {
-      if (guardBlock.length < 3) {
-        for (const g of guardBlock) merged.push(`  IF:${g} \u2192 RET`);
-      } else {
-        merged.push(`  GUARD:[${guardBlock.join(", ")}]`);
-      }
-      guardBlock = [];
-    }
+    flushGuards();
     merged.push(line);
   }
-  if (guardBlock.length > 0) {
-    if (guardBlock.length < 3) {
-      for (const g of guardBlock) merged.push(`  IF:${g} \u2192 RET`);
-    } else {
-      merged.push(`  GUARD:[${guardBlock.join(", ")}]`);
-    }
-  }
+  flushGuards();
   return merged.join("\n");
 }
 
@@ -3062,40 +3082,45 @@ function writeCursorHooks(projectPath, result) {
   if (existed) result.merged.push(relPath);
   else result.written.push(relPath);
 }
-function initCursor(projectPath, result) {
-  writeJsonMerged(
-    join7(projectPath, ".cursor", "mcp.json"),
-    {
-      mcpServers: {
-        composto: {
-          command: "composto-mcp",
-          env: { COMPOSTO_BLASTRADIUS: "1" }
+function initCursor(projectPath, result, options) {
+  if (options.withMcp) {
+    writeJsonMerged(
+      join7(projectPath, ".cursor", "mcp.json"),
+      {
+        mcpServers: {
+          composto: {
+            command: "composto-mcp",
+            env: { COMPOSTO_BLASTRADIUS: "1" }
+          }
         }
-      }
-    },
-    result,
-    ".cursor/mcp.json"
-  );
-  writeFileSkipIfExists(
-    join7(projectPath, ".cursor", "rules", "composto.mdc"),
-    CURSOR_RULES_MDC,
-    result,
-    ".cursor/rules/composto.mdc"
-  );
+      },
+      result,
+      ".cursor/mcp.json"
+    );
+  }
+  if (options.withRules) {
+    writeFileSkipIfExists(
+      join7(projectPath, ".cursor", "rules", "composto.mdc"),
+      CURSOR_RULES_MDC,
+      result,
+      ".cursor/rules/composto.mdc"
+    );
+  }
   writeCursorHooks(projectPath, result);
 }
-function initClaudeCode(projectPath, result) {
+function initClaudeCode(projectPath, result, options) {
   const settingsPath = join7(projectPath, ".claude", "settings.json");
   const relPath = ".claude/settings.json";
   const existed = existsSync4(settingsPath);
   const existing = readJsonIfExists(settingsPath);
-  const mcpServers = {
-    ...existing.mcpServers ?? {},
+  const baseExistingMcp = existing.mcpServers ?? {};
+  const mcpServers = options.withMcp ? {
+    ...baseExistingMcp,
     composto: {
       command: "composto-mcp",
       env: { COMPOSTO_BLASTRADIUS: "1" }
     }
-  };
+  } : baseExistingMcp;
   const compostoHookEntry = {
     matcher: "Edit|Write|MultiEdit",
     hooks: [
@@ -3110,9 +3135,11 @@ function initClaudeCode(projectPath, result) {
   );
   const merged = {
     ...existing,
-    mcpServers,
     hooks: { ...existingHooks, PreToolUse: preToolUse }
   };
+  if (Object.keys(mcpServers).length > 0) {
+    merged.mcpServers = mcpServers;
+  }
   ensureDir(settingsPath);
   writeFileSync2(settingsPath, JSON.stringify(merged, null, 2) + "\n");
   if (existed) result.merged.push(relPath);
@@ -3124,13 +3151,14 @@ function initGeminiCli(_projectPath, result, options) {
   try {
     const existed = existsSync4(settingsPath);
     const existing = readJsonIfExists(settingsPath);
-    const mcpServers = {
-      ...existing.mcpServers ?? {},
+    const baseExistingMcp = existing.mcpServers ?? {};
+    const mcpServers = options.withMcp ? {
+      ...baseExistingMcp,
       composto: {
         command: "composto-mcp",
         env: { COMPOSTO_BLASTRADIUS: "1" }
       }
-    };
+    } : baseExistingMcp;
     const compostoHookEntry = {
       matcher: "edit_file|write_file|replace",
       hooks: [
@@ -3145,9 +3173,11 @@ function initGeminiCli(_projectPath, result, options) {
     );
     const merged = {
       ...existing,
-      mcpServers,
       hooks: { ...existingHooks, BeforeTool: beforeTool }
     };
+    if (Object.keys(mcpServers).length > 0) {
+      merged.mcpServers = mcpServers;
+    }
     ensureDir(settingsPath);
     writeFileSync2(settingsPath, JSON.stringify(merged, null, 2) + "\n");
     if (existed) result.merged.push(relPath);
@@ -3160,9 +3190,9 @@ function initGeminiCli(_projectPath, result, options) {
 function runInit(projectPath, options) {
   const client = options.client ?? "cursor";
   const result = { client, written: [], skipped: [], merged: [] };
-  if (client === "claude-code") initClaudeCode(projectPath, result);
+  if (client === "claude-code") initClaudeCode(projectPath, result, options);
   else if (client === "gemini-cli") initGeminiCli(projectPath, result, options);
-  else initCursor(projectPath, result);
+  else initCursor(projectPath, result, options);
   return result;
 }
 
@@ -3583,7 +3613,16 @@ function renderSummary(s) {
 }
 
 // src/index.ts
+import { createRequire } from "module";
 import { join as join13, resolve as resolve2 } from "path";
+var PKG_VERSION = (() => {
+  try {
+    const req = createRequire(import.meta.url);
+    return req("../package.json").version;
+  } catch {
+    return "0.0.0";
+  }
+})();
 async function readStdin() {
   if (process.stdin.isTTY) return "";
   const chunks = [];
@@ -3675,7 +3714,13 @@ switch (command) {
       console.error(`Unknown --client=${clientArg}. Valid: ${valid.join(", ")}`);
       process.exit(1);
     }
-    const result = runInit(resolve2("."), { client: clientArg });
+    const withRules = args.includes("--with-rules");
+    const withMcp = args.includes("--with-mcp");
+    const result = runInit(resolve2("."), {
+      client: clientArg,
+      withRules,
+      withMcp
+    });
     console.log(`composto init \u2014 configured for ${result.client}
 `);
     for (const f of result.written) console.log(`  wrote   ${f}`);
@@ -3738,10 +3783,11 @@ switch (command) {
     break;
   }
   case "version":
-    console.log("composto v0.4.2");
+    console.log(`composto v${PKG_VERSION}`);
     break;
   default:
-    console.log("composto v0.4.2 \u2014 less tokens, more insight\n");
+    console.log(`composto v${PKG_VERSION} \u2014 less tokens, more insight
+`);
     console.log("Commands:");
     console.log("  scan [path]                           Scan codebase for issues");
     console.log("  trends [path]                         Analyze codebase health trends");
@@ -3753,8 +3799,10 @@ switch (command) {
     console.log("  impact <file>                         Show historical blast radius for a file");
     console.log("  index [--since=YYYY-MM-DD]            Build or refresh the memory index (--since bounds work for huge repos)");
     console.log("  index --status                        Show memory index diagnostics");
-    console.log("  init [--client=<name>]                Configure Composto MCP + hooks for an AI client");
-    console.log("                                          (clients: cursor, claude-code, gemini-cli)");
+    console.log("  init [--client=<name>] [--with-mcp] [--with-rules]");
+    console.log("                                        Lean Hook init (clients: cursor, claude-code, gemini-cli)");
+    console.log("                                          --with-mcp   register the composto MCP server (5 tools)");
+    console.log("                                          --with-rules write .cursor/rules/composto.mdc (cursor only)");
     console.log("  hook <platform> <event>               Run BlastRadius hook (reads tool JSON from stdin)");
     console.log("  stats [--json] [--disable]            Show hook telemetry (last 7d); --disable opts out");
     console.log("  version                               Show version");

package/dist/mcp/server.js

@@ -5,7 +5,8 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { readFileSync as readFileSync4 } from "fs";
-import { resolve as resolve2, relative as relative2, join as join6 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { resolve as resolve2, relative as relative2, join as join6, dirname as dirname5 } from "path";
 
 // src/ir/structure.ts
 var CLASSIFIERS = [
@@ -650,8 +651,9 @@ function emitTier1(node) {
   const outPrefix = exported ? "OUT " : "";
   switch (node.type) {
     case "import_statement": {
-      const text = collapseText(node.text, 80);
-      return `USE:${text}`;
+      const source = node.childForFieldName("source")?.text;
+      if (source) return `USE:${source.slice(1, -1)}`;
+      return `USE:${collapseText(node.text, 80)}`;
     }
     case "function_declaration": {
       const name = node.childForFieldName("name")?.text ?? "anonymous";
@@ -781,9 +783,30 @@ function emitTier3(node) {
         }
         if (node.parent?.type === "statement_block") return null;
         const vt = value.type;
-        if (vt === "number" || vt === "true" || vt === "false") return null;
-        if (vt === "object" || vt === "array") return null;
-        if (vt === "new_expression" || vt === "call_expression") return null;
+        if (vt === "number" || vt === "true" || vt === "false") {
+          return `VAR:${name} = ${value.text}`;
+        }
+        if (vt === "array") {
+          return `VAR:${name}[${value.namedChildCount}]`;
+        }
+        if (vt === "object") {
+          const keys = [];
+          for (let i = 0; i < value.namedChildCount; i++) {
+            const member = value.namedChild(i);
+            keys.push(member.childForFieldName("key")?.text ?? member.text);
+            if (keys.length >= 6) break;
+          }
+          const more = value.namedChildCount > keys.length ? ", ..." : "";
+          return `VAR:${name}{${collapseText(keys.join(", "), 50)}${more}}`;
+        }
+        if (vt === "new_expression") {
+          const ctor = value.childForFieldName("constructor")?.text ?? "?";
+          return `VAR:${name} = new ${ctor}(...)`;
+        }
+        if (vt === "call_expression") {
+          const callee = value.childForFieldName("function")?.text ?? "?";
+          return `VAR:${name} = ${collapseText(callee, 40)}(...)`;
+        }
         const valText = value.text.replace(/"[^"]*"/g, '""').replace(/'[^']*'/g, "''").replace(/`[^`]*`/g, "``");
         return `VAR:${name} = ${collapseText(valText, 50)}`;
       }
@@ -944,29 +967,27 @@ async function astWalkIR(code, filePath) {
   }
   const merged = [];
   let guardBlock = [];
+  const guardValue = (ret) => ret.replace(/^RET\s+/, "");
+  const flushGuards = () => {
+    if (guardBlock.length === 0) return;
+    if (guardBlock.length < 3) {
+      for (const g of guardBlock) merged.push(`${g.indent}IF:${g.cond} \u2192 ${g.ret}`);
+    } else {
+      const entries = guardBlock.map((g) => `${g.cond} \u2192 ${guardValue(g.ret)}`);
+      merged.push(`${guardBlock[0].indent}GUARD:[${entries.join(", ")}]`);
+    }
+    guardBlock = [];
+  };
   for (const line of pass1) {
-    const guardMatch = line.match(/^(\s*)IF:(.+?) \u2192 RET/);
+    const guardMatch = line.match(/^(\s*)IF:(.+?) \u2192 (.+)$/);
     if (guardMatch) {
-      guardBlock.push(guardMatch[2].trim());
+      guardBlock.push({ indent: guardMatch[1], cond: guardMatch[2].trim(), ret: guardMatch[3].trim() });
       continue;
     }
-    if (guardBlock.length > 0) {
-      if (guardBlock.length < 3) {
-        for (const g of guardBlock) merged.push(`  IF:${g} \u2192 RET`);
-      } else {
-        merged.push(`  GUARD:[${guardBlock.join(", ")}]`);
-      }
-      guardBlock = [];
-    }
+    flushGuards();
     merged.push(line);
   }
-  if (guardBlock.length > 0) {
-    if (guardBlock.length < 3) {
-      for (const g of guardBlock) merged.push(`  IF:${g} \u2192 RET`);
-    } else {
-      merged.push(`  GUARD:[${guardBlock.join(", ")}]`);
-    }
-  }
+  flushGuards();
   return merged.join("\n");
 }
 
@@ -2381,13 +2402,26 @@ var MemoryAPI = class {
 
 // src/mcp/server.ts
 var ALL_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".py", ".go", ".rs"];
+var PKG_VERSION = (() => {
+  try {
+    const pkgPath = join6(
+      dirname5(fileURLToPath3(import.meta.url)),
+      "..",
+      "..",
+      "package.json"
+    );
+    return JSON.parse(readFileSync4(pkgPath, "utf-8")).version;
+  } catch {
+    return "0.0.0";
+  }
+})();
 var server = new McpServer({
   name: "composto",
-  version: "0.4.2"
+  version: PKG_VERSION
 });
 server.tool(
   "composto_ir",
-  "Generate compressed IR (Intermediate Representation) for a source file. Uses AST parsing to keep function signatures, control flow, and dependencies while dropping 89% of noise tokens. Use this instead of reading raw files when you need to understand what a file does.",
+  "Compressed AST-based IR for a file. ~89% fewer tokens than raw read.",
   {
     file: z.string().describe("Path to the source file"),
     layer: z.enum(["L0", "L1", "L2", "L3"]).default("L1").describe("L0=structure only, L1=full IR (default), L2=delta context, L3=raw source")
@@ -2423,7 +2457,7 @@ ${result}` }]
 );
 server.tool(
   "composto_benchmark",
-  "Benchmark how much Composto saves across a directory. Shows per-file token savings comparing raw code vs compressed IR.",
+  "Per-file token-savings benchmark across a directory.",
   {
     path: z.string().default(".").describe("Directory to benchmark")
   },
@@ -2455,7 +2489,7 @@ server.tool(
 );
 server.tool(
   "composto_context",
-  "Pack maximum code context into a token budget. When target symbol is provided, its file is included as raw code (L3) while surrounding files get compressed IR. Perfect for 'fix this bug in X' or 'why does X return wrong value' \u2014 LLM sees exact code of target plus compressed context. Without target, hotspot files get L1, rest get L0.",
+  "Pack code into a token budget; target raw, neighbors as IR.",
   {
     path: z.string().default(".").describe("Directory to pack"),
     budget: z.number().default(4e3).describe("Maximum tokens to use"),
@@ -2518,7 +2552,7 @@ Files: ${parts.join(", ")}`);
 );
 server.tool(
   "composto_scan",
-  "Scan codebase for security issues (hardcoded secrets, API keys) and debug artifacts (console.log). Zero token cost \u2014 pure local analysis.",
+  "Scan for hardcoded secrets and debug artifacts. Local-only.",
   {
     path: z.string().default(".").describe("Directory to scan")
   },
@@ -2551,7 +2585,7 @@ server.tool(
 );
 server.tool(
   "composto_blastradius",
-  'Predict the historical blast radius of a code change before applying it. Returns a risk verdict (low/medium/high/unknown), confidence, and the git-derived signals behind it (revert history, hotspots, fix ratio, coverage decline, ownership churn). Call BEFORE proposing significant edits to files with non-trivial history. Honest about uncertainty \u2014 returns "unknown" when confidence is low instead of guessing. Degraded modes (empty repo, shallow clone, indexing) are explicit in the `status` field.',
+  "Risk verdict (low/medium/high/unknown) for editing a file, from git history.",
   {
     file: z.string().describe("Repo-relative path of the file the agent intends to modify."),
     intent: z.enum(["refactor", "bugfix", "feature", "test", "docs", "unknown"]).default("unknown").optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composto-ai",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Proactive AI team companion — less tokens, more insight",
   "type": "module",
   "bin": {