gm-cc 2.0.244 → 2.0.246

package/.claude-plugin/marketplace.json

@@ -4,7 +4,7 @@
     "name": "AnEntrypoint"
   },
   "description": "State machine agent with hooks, skills, and automated git enforcement",
-  "version": "2.0.244",
+  "version": "2.0.246",
   "metadata": {
     "description": "State machine agent with hooks, skills, and automated git enforcement"
   },

package/hooks/pre-tool-use-hook.js

@@ -13,7 +13,7 @@ const projectDir = process.env.CLAUDE_PROJECT_DIR || process.env.GEMINI_PROJECT_
 const TOOLS_DIR = path.join(os.homedir(), '.claude', 'gm-tools');
 const CHECK_STAMP = path.join(TOOLS_DIR, '.last-check');
 const PKG_JSON = path.join(TOOLS_DIR, 'package.json');
-const MANAGED_PKGS = ['codebasesearch', 'mcp-thorns', 'agent-browser'];
+const MANAGED_PKGS = ['agent-browser'];
 const CHECK_INTERVAL_MS = 60 * 1000; // 60 seconds
 
 function ensureToolsDir() {
@@ -124,12 +124,27 @@ function loadLangPlugins(projectDir) {
 }
 
 // Helper: run a local binary (falls back to bunx if not installed)
+function pkgEntry(name) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(TOOLS_DIR, 'node_modules', name, 'package.json'), 'utf8'));
+    const binVal = pkg.bin;
+    const rel = typeof binVal === 'string' ? binVal : (binVal?.[name] || Object.values(binVal || {})[0]);
+    if (rel) return path.join(TOOLS_DIR, 'node_modules', name, rel);
+  } catch {}
+  return null;
+}
+
 function runLocal(name, args, opts = {}) {
+  if (IS_WIN) {
+    const entry = pkgEntry(name);
+    if (entry && fs.existsSync(entry)) {
+      return spawnSync('bun', [entry, ...args], { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
+    }
+  }
   const bin = localBin(name);
   if (fs.existsSync(bin)) {
     return spawnSync(bin, args, { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
   }
-  // Fallback to bunx
   return spawnSync('bun', ['x', name, ...args], { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
 }
 
@@ -163,15 +178,15 @@ const allowWithNoop = (context) => {
   };
 };
 
-// ─── rs-exec runner helper ────────────────────────────────────────────────────
-function rsExecBin() { return path.join(TOOLS_DIR, IS_WIN ? 'rs-exec.exe' : 'rs-exec'); }
+// ─── plugkit runner helper ────────────────────────────────────────────────────
+function plugkitBin() { return path.join(TOOLS_DIR, IS_WIN ? 'plugkit.exe' : 'plugkit'); }
 
 function runGmExec(args, opts = {}) {
-  const bin = rsExecBin();
+  const bin = plugkitBin();
   if (fs.existsSync(bin)) {
     return spawnSync(bin, args, { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
   }
-  return spawnSync('rs-exec', args, { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
+  return spawnSync('plugkit', args, { encoding: 'utf8', windowsHide: true, timeout: 65000, ...opts });
 }
 
 // ─── Main hook ────────────────────────────────────────────────────────────────
@@ -394,7 +409,7 @@ const run = () => {
 
         if (['codesearch', 'search'].includes(lang)) {
           const query = safeCode.trim();
-          const r = runLocal('codebasesearch', [query], { timeout: 30000, ...(cwd && { cwd }) });
+          const r = runGmExec(['search', ...(cwd ? ['--path', cwd] : []), query], { timeout: 30000, ...(cwd && { cwd }) });
           return allowWithNoop(`exec:${lang} output:\n\n${stripFooter((r.stdout || '') + (r.stderr || '')) || '(no results)'}`);
         }
         if (lang === 'status') {
@@ -462,7 +477,7 @@ const run = () => {
         }
       }
 
-      if (/^bun\s+x\s+(gm-exec|rs-exec|codebasesearch)/.test(command)) {
+      if (/^bun\s+x\s+(gm-exec|rs-exec|plugkit|codebasesearch)/.test(command)) {
         return deny(`Do not call ${command.match(/^bun\s+x\s+(\S+)/)[1]} directly. Use exec:<lang> syntax instead.\n\nExamples:\n  exec:nodejs\n  console.log("hello")\n\n  exec:codesearch\n  find all database queries\n\n  exec:bash\n  ls -la\n\nThe exec: prefix routes through the hook dispatcher which handles language detection, background tasks, and tool management automatically.`);
       }
 

package/hooks/prompt-submit-hook.js

@@ -26,6 +26,16 @@ function runLocal(name, args, opts = {}) {
   return spawnSync('bun', ['x', name, ...args], { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
 }
 
+function plugkitBin() { return path.join(TOOLS_DIR, IS_WIN ? 'plugkit.exe' : 'plugkit'); }
+
+function runPlugkit(args, opts = {}) {
+  const bin = plugkitBin();
+  if (fs.existsSync(bin)) {
+    return spawnSync(bin, args, { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
+  }
+  return spawnSync('plugkit', args, { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
+}
+
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.env.GEMINI_PROJECT_DIR || process.env.OC_PROJECT_DIR || process.env.KILO_PROJECT_DIR;
 
 function loadLangPlugins(dir) {
@@ -107,9 +117,9 @@ const ensureGitignore = () => {
 const runThorns = () => {
   if (!projectDir || !fs.existsSync(projectDir)) return '';
   try {
-    const r = runLocal('mcp-thorns', [projectDir], { timeout: 15000 });
+    const r = runPlugkit(['codeinsight', projectDir], { timeout: 15000 });
     const out = ((r.stdout || '') + (r.stderr || '')).trim();
-    return out ? `=== mcp-thorns ===\n${out}` : '';
+    return out ? `=== codeinsight ===\n${out}` : '';
   } catch (e) {
     return '';
   }
@@ -118,9 +128,9 @@ const runThorns = () => {
 const runCodeSearch = (prompt) => {
   if (!prompt || !projectDir) return '';
   try {
-    const r = runLocal('codebasesearch', [prompt], { timeout: 10000, cwd: projectDir });
+    const r = runPlugkit(['search', '--path', projectDir, prompt], { timeout: 10000, cwd: projectDir });
     const out = ((r.stdout || '') + (r.stderr || '')).trim();
-    return out ? `=== codebasesearch ===\n${out}` : '';
+    return out ? `=== search ===\n${out}` : '';
   } catch (e) {
     return '';
   }

package/hooks/session-start-hook.js

@@ -13,7 +13,23 @@ function localBin(name) {
   return path.join(TOOLS_DIR, 'node_modules', '.bin', name + ext);
 }
 
+function pkgEntry(name) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(TOOLS_DIR, 'node_modules', name, 'package.json'), 'utf8'));
+    const binVal = pkg.bin;
+    const rel = typeof binVal === 'string' ? binVal : (binVal?.[name] || Object.values(binVal || {})[0]);
+    if (rel) return path.join(TOOLS_DIR, 'node_modules', name, rel);
+  } catch {}
+  return null;
+}
+
 function runLocal(name, args, opts = {}) {
+  if (IS_WIN) {
+    const entry = pkgEntry(name);
+    if (entry && fs.existsSync(entry)) {
+      return spawnSync('bun', [entry, ...args], { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
+    }
+  }
   const bin = localBin(name);
   if (fs.existsSync(bin)) {
     return spawnSync(bin, args, { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
@@ -21,28 +37,22 @@ function runLocal(name, args, opts = {}) {
   return spawnSync('bun', ['x', name, ...args], { encoding: 'utf8', windowsHide: true, timeout: 30000, ...opts });
 }
 
-const MANAGED_PKGS = ['codebasesearch', 'mcp-thorns', 'agent-browser'];
+const MANAGED_PKGS = ['agent-browser'];
 const PKG_JSON = path.join(TOOLS_DIR, 'package.json');
 
-const RS_EXEC_REPO = 'AnEntrypoint/rs-exec';
+const PLUGKIT_REPO = 'AnEntrypoint/rs-plugkit';
 const archMap = { x64: 'x86_64', arm64: 'aarch64', ia32: 'x86_64' };
-const osTargets = {
-  win32: a => `rs-exec-${a}-pc-windows-msvcexe`,
-  darwin: a => `rs-exec-${a}-apple-darwin`,
-  linux: a => `rs-exec-${a}-unknown-linux-gnu`,
-};
-const osProcTargets = {
-  win32: a => `rs-exec-process-${a}-pc-windows-msvcexe`,
-  darwin: a => `rs-exec-process-${a}-apple-darwin`,
-  linux: a => `rs-exec-process-${a}-unknown-linux-gnu`,
+const plugkitTargets = {
+  win32: a => `plugkit-x86_64-pc-windows-msvc/plugkit.exe`,
+  darwin: a => `plugkit-x86_64-unknown-linux-gnu/plugkit`,
+  linux: a => `plugkit-x86_64-unknown-linux-gnu/plugkit`,
 };
 
-function rsExecBin() { return path.join(TOOLS_DIR, IS_WIN ? 'rs-exec.exe' : 'rs-exec'); }
-function rsExecProcessBin() { return path.join(TOOLS_DIR, IS_WIN ? 'rs-exec-process.exe' : 'rs-exec-process'); }
+function plugkitBin() { return path.join(TOOLS_DIR, IS_WIN ? 'plugkit.exe' : 'plugkit'); }
 
-function downloadBin(assetName, dest) {
+function downloadBin(assetPath, dest) {
   const https = require('https');
-  const url = `https://github.com/${RS_EXEC_REPO}/releases/latest/download/${assetName}`;
+  const url = `https://github.com/${PLUGKIT_REPO}/releases/latest/download/${assetPath}`;
   return new Promise((resolve) => {
     const follow = (u) => https.get(u, { headers: { 'User-Agent': 'gm' } }, res => {
       if (res.statusCode >= 300 && res.statusCode < 400) return follow(res.headers.location);
@@ -54,15 +64,12 @@ function downloadBin(assetName, dest) {
   });
 }
 
-async function ensureRsExec() {
-  const arch = archMap[process.arch] || 'x86_64';
-  const plat = process.platform;
-  const mainBin = rsExecBin();
-  const procBin = rsExecProcessBin();
-  const downloads = [];
-  if (!fs.existsSync(mainBin)) downloads.push(downloadBin(osTargets[plat]?.(arch) || osTargets.linux(arch), mainBin));
-  if (!fs.existsSync(procBin)) downloads.push(downloadBin(osProcTargets[plat]?.(arch) || osProcTargets.linux(arch), procBin));
-  if (downloads.length) await Promise.all(downloads);
+async function ensurePlugkit() {
+  const bin = plugkitBin();
+  if (!fs.existsSync(bin)) {
+    const assetPath = plugkitTargets[process.platform]?.(archMap[process.arch] || 'x86_64') || plugkitTargets.linux('x86_64');
+    await downloadBin(assetPath, bin);
+  }
 }
 
 function ensureTools() {
@@ -81,7 +88,7 @@ function ensureTools() {
 }
 
 ensureTools();
-ensureRsExec().catch(() => {});
+ensurePlugkit().catch(() => {});
 
 const projectDir = process.env.CLAUDE_PROJECT_DIR || process.env.GEMINI_PROJECT_DIR || process.env.OC_PROJECT_DIR || process.env.KILO_PROJECT_DIR;
 
@@ -134,14 +141,17 @@ ensureGitignore();
 try {
   let outputs = [];
 
-  outputs.push('Use the Skill tool with skill: "gm" to begin — do NOT use the Agent tool to load skills. Skills are invoked via the Skill tool only, never as agents. All code execution uses exec:<lang> via the Bash tool — never direct Bash(node ...) or Bash(npm ...) or Bash(npx ...) or Bash(bun x rs-exec ...).');
+  outputs.push('Use the Skill tool with skill: "gm" to begin — do NOT use the Agent tool to load skills. Skills are invoked via the Skill tool only, never as agents. All code execution uses exec:<lang> via the Bash tool — never direct Bash(node ...) or Bash(npm ...) or Bash(npx ...) or Bash(plugkit ...).');
 
   if (projectDir && fs.existsSync(projectDir)) {
     try {
-      const r = runLocal('mcp-thorns', [projectDir], { timeout: 15000 });
-      const thornOutput = ((r.stdout || '') + (r.stderr || '')).trim();
-      if (thornOutput) {
-        outputs.push(`=== This is your initial insight of the repository, look at every possible aspect of this for initial opinionation and to offset the need for code exploration ===\n${thornOutput}`);
+      const bin = plugkitBin();
+      const r = fs.existsSync(bin)
+        ? spawnSync(bin, ['codeinsight', projectDir], { encoding: 'utf8', windowsHide: true, timeout: 15000 })
+        : spawnSync('plugkit', ['codeinsight', projectDir], { encoding: 'utf8', windowsHide: true, timeout: 15000 });
+      const insightOutput = ((r.stdout || '') + (r.stderr || '')).trim();
+      if (insightOutput) {
+        outputs.push(`=== This is your initial insight of the repository, look at every possible aspect of this for initial opinionation and to offset the need for code exploration ===\n${insightOutput}`);
       }
     } catch (e) {}
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-cc",
-  "version": "2.0.244",
+  "version": "2.0.246",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "gm",
-  "version": "2.0.244",
+  "version": "2.0.246",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": {
     "name": "AnEntrypoint",

package/scripts/postinstall-kilo.js

@@ -102,7 +102,7 @@ function install() {
 }
 
 function warmBunCache() {
-  const packages = ['mcp-thorns@latest', 'codebasesearch@latest'];
+  const packages = [];
   for (const pkg of packages) {
     try {
       execSync(`bun x ${pkg} --version`, {

package/scripts/postinstall-oc.js

@@ -101,7 +101,7 @@ function install() {
 }
 
 function warmBunCache() {
-  const packages = ['mcp-thorns@latest', 'codebasesearch@latest'];
+  const packages = [];
   for (const pkg of packages) {
     try {
       execSync(`bun x ${pkg} --version`, {

package/scripts/postinstall.js

@@ -63,7 +63,7 @@ function updateGitignore(projectRoot) {
 }
 
 function warmBunCache() {
-  const packages = ['mcp-thorns@latest', 'codebasesearch@latest'];
+  const packages = [];
   for (const pkg of packages) {
     try {
       execSync(`bun x ${pkg} --version`, {