gm-kilo 2.0.39 → 2.0.40

package/gm.mjs

@@ -7,28 +7,39 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default async ({ project, client, $, directory, worktree }) => {
   const pluginDir = __dirname;
   let agentRules = '';
-  let thornsPromise = null;
-  let thornsOutput = '';
-
   const loadAgentRules = () => {
-    if (agentRules) return agentRules;
     const agentMd = path.join(pluginDir, 'agents', 'gm.md');
-    try { agentRules = fs.readFileSync(agentMd, 'utf-8'); } catch (e) {}
-    return agentRules;
+    try { return fs.readFileSync(agentMd, 'utf-8'); } catch (e) { return ''; }
   };
 
-  // Start thorns in background immediately on plugin load
-  const startThorns = () => {
-    if (thornsPromise) return thornsPromise;
-    thornsPromise = new Promise((resolve) => {
-      exec('bun x mcp-thorns@latest', {
-        encoding: 'utf-8', cwd: directory, timeout: 180000
-      }, (err, stdout) => {
-        thornsOutput = err ? '' : (stdout || '').trim();
-        resolve(thornsOutput);
-      });
+  const runThorns = () => new Promise((resolve) => {
+    exec('bun x mcp-thorns@latest', {
+      encoding: 'utf-8', cwd: directory, timeout: 180000
+    }, (err, stdout) => resolve(err ? '' : (stdout || '').trim()));
+  });
+
+  const runCodeSearch = (query) => new Promise((resolve) => {
+    const q = query.replace(/"/g, '\\"').substring(0, 200);
+    exec('bun x codebasesearch@latest "' + q + '"', {
+      encoding: 'utf-8', cwd: directory, timeout: 55000
+    }, (err, stdout) => {
+      if (err) return resolve('');
+      const lines = (stdout || '').split('\n');
+      const start = lines.findIndex(l => l.includes('Searching for:'));
+      resolve(start >= 0 ? lines.slice(start).join('\n').trim() : (stdout || '').trim());
     });
-    return thornsPromise;
+  });
+
+  const getLastUserMessage = (msgs) => {
+    for (let i = msgs.length - 1; i >= 0; i--) {
+      const m = msgs[i];
+      if (m.role === 'user') {
+        const parts = Array.isArray(m.content) ? m.content : [m.content];
+        const text = parts.map(p => typeof p === 'string' ? p : (p?.text || '')).join(' ').trim();
+        if (text) return text;
+      }
+    }
+    return '';
   };
 
   const prdFile = path.join(directory, '.prd');
@@ -39,12 +50,19 @@ export default async ({ project, client, $, directory, worktree }) => {
       const prd = fs.existsSync(prdFile) ? fs.readFileSync(prdFile, 'utf-8').trim() : '';
       let content = rules || '';
       if (prd) content += '\n\nPENDING WORK (.prd):\n' + prd;
-      // Inject thorns only on the first API call of a conversation (no assistant messages yet)
+      // On every user prompt: run thorns fresh + codebasesearch
+      // Skip if last message is from assistant (no new user prompt, e.g. tool result inject)
       const msgs = input?.messages || [];
-      const isFirstCall = !msgs.some(m => m.role === 'assistant');
-      if (isFirstCall) {
-        const thorns = await startThorns();
+      const lastMsg = msgs.length > 0 ? msgs[msgs.length - 1] : null;
+      const hasNewUserPrompt = !lastMsg || lastMsg.role === 'user';
+      if (hasNewUserPrompt) {
+        const userQuery = getLastUserMessage(msgs);
+        const [thorns, search] = await Promise.all([
+          runThorns(),
+          userQuery ? runCodeSearch(userQuery) : Promise.resolve('')
+        ]);
         if (thorns) content += '\n\n=== Repository Analysis (mcp-thorns) ===\n' + thorns;
+        if (search) content += '\n\n=== Semantic code search results ===\n' + search;
       }
       if (content) output.system.push(content);
     }

package/package.json

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