gm-kilo 2.0.1061 → 2.0.1062

package/gm-kilo.mjs

@@ -2,7 +2,6 @@ import { readFileSync, existsSync, writeFileSync, unlinkSync } from 'fs';
 import { join, dirname, extname, basename } from 'path';
 import { fileURLToPath } from 'url';
 import { spawnSync } from 'child_process';
-import { tmpdir } from 'os';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const LANG_ALIASES = { js:'nodejs',javascript:'nodejs',ts:'typescript',node:'nodejs',py:'python',sh:'bash',shell:'bash',zsh:'bash' };
@@ -29,18 +28,53 @@ function stripFooter(s) { return s ? s.replace(/\n\[Running tools\][\s\S]*$/, ''
 function runExecSync(rawLang, code, cwd) {
   const lang = LANG_ALIASES[rawLang] || rawLang || 'nodejs';
   const projectDir = cwd || process.cwd();
-  if (lang === 'codesearch' || lang === 'search') return runPlugkit(['search', '--path', projectDir, code.trim()]);
-  if (['runner','status','sleep','close'].includes(lang)) return runPlugkit([lang, code.trim()]);
-  if (['browser','tail','watch','wait','type','kill-port','health','recall','memorize','forget','feedback','discipline','pause'].includes(lang)) {
-    return runPlugkit(['exec', '--lang', lang, '--code', code.trim(), '--cwd', projectDir]);
-  }
-  if (lang === 'cmd') {
-    const opts = { encoding: 'utf-8', timeout: 30000, windowsHide: true, cwd: projectDir };
-    const r = spawnSync('cmd', ['/c', code], opts);
-    const o = (r.stdout || '').trimEnd(), e = stripFooter(r.stderr || '').trimEnd();
-    return o && e ? o + '\n[stderr]\n' + e : o || e || '(no output)';
+  const spoolBase = join(projectDir, '.gm', 'exec-spool');
+  const taskId = Date.now() + '-' + Math.random().toString(16).slice(2, 8);
+
+  const isVerb = ['codesearch','recall','memorize','wait','sleep','status','close','browser','runner','type','kill-port','forget','feedback','discipline','pause','health'].includes(lang);
+  const langDir = lang.match(/^(nodejs|python|bash|typescript|go|rust|c|cpp|java|deno)$/) ? lang : 'nodejs';
+  const ext = {nodejs:'js',python:'py',bash:'sh',typescript:'ts',go:'go',rust:'rs',c:'c',cpp:'cpp',java:'java',deno:'ts'}[langDir] || 'js';
+
+  const inDir = join(spoolBase, 'in', isVerb ? lang : langDir);
+  const outDir = join(spoolBase, 'out');
+  const inFile = join(inDir, taskId + (isVerb ? '.txt' : '.' + ext));
+  const jsonFile = join(outDir, taskId + '.json');
+
+  try { fs.mkdirSync(inDir, { recursive: true }); fs.mkdirSync(outDir, { recursive: true }); } catch(e) {}
+  writeFileSync(inFile, code, 'utf-8');
+
+  const start = Date.now();
+  while (Date.now() - start < 28000) {
+    if (existsSync(jsonFile)) {
+      try {
+        const meta = JSON.parse(readFileSync(jsonFile, 'utf-8'));
+        const outFile = jsonFile.replace(/\.json$/, '.out');
+        const errFile = jsonFile.replace(/\.json$/, '.err');
+        const stdout = existsSync(outFile) ? readFileSync(outFile, 'utf-8') : '';
+        const stderr = existsSync(errFile) ? readFileSync(errFile, 'utf-8') : '';
+        const o = stdout.trimEnd(), e = stripFooter(stderr).trimEnd();
+        return o && e ? o + '\n[stderr]\n' + e : o || e || '(no output)';
+      } catch(e) {}
+    }
+    try { require('child_process').execSync('sleep 0.05', { stdio: 'ignore' }); } catch(e) { const s = Date.now(); while(Date.now()-s<50){} }
   }
-  return runPlugkit(['exec', '--lang', lang, '--code', code.trim(), '--cwd', projectDir]);
+  return '[spool dispatch timeout after 28s]';
+}
+
+function ensureSpoolWatcher(dir) {
+  try {
+    const spoolBase = join(dir, '.gm', 'exec-spool');
+    const pidFile = join(spoolBase, '.watcher.pid');
+    try { fs.mkdirSync(spoolBase, { recursive: true }); } catch(e) {}
+    const alreadyRunning = existsSync(pidFile) && (() => { try { const p = parseInt(readFileSync(pidFile,'utf-8')); process.kill(p,0); return true; } catch(e) { return false; } })();
+    if (!alreadyRunning) {
+      const r = spawnSync('node', [join(__dirname, '..', 'bin', 'plugkit.js'), 'spool'], {
+        detached: true, stdio: 'ignore', windowsHide: true,
+        env: { ...process.env, GM_SPOOL_DIR: spoolBase }
+      });
+      if (r.pid) { try { writeFileSync(pidFile, String(r.pid), 'utf-8'); } catch(e) {} }
+    }
+  } catch(e) {}
 }
 
 const BANNED_BASH = ['grep','rg','find','glob','awk','sed','cat','head','tail'];
@@ -61,7 +95,19 @@ export async function GmPlugin({ directory }) {
       if (!sessionStarted) {
         sessionStarted = true;
         try { runPlugkit(['hook', 'session-start']); } catch(e) {}
-        try { runPlugkit(['bootstrap', directory]); } catch(e) {}
+        try {
+          const spoolBase = join(directory, '.gm', 'exec-spool');
+          const pidFile = join(spoolBase, '.watcher.pid');
+          try { fs.mkdirSync(spoolBase, { recursive: true }); } catch(e) {}
+          const alreadyRunning = existsSync(pidFile) && (() => { try { const p = parseInt(readFileSync(pidFile,'utf-8')); process.kill(p,0); return true; } catch(e) { return false; } })();
+          if (!alreadyRunning) {
+            const r = spawnSync('node', [join(__dirname, '..', 'bin', 'plugkit.js'), 'spool'], {
+              detached: true, stdio: 'ignore', windowsHide: true,
+              env: { ...process.env, GM_SPOOL_DIR: spoolBase }
+            });
+            if (r.pid) { try { writeFileSync(pidFile, String(r.pid), 'utf-8'); } catch(e) {} }
+          }
+        } catch(e) {}
       }
     },
 
@@ -81,7 +127,7 @@ export async function GmPlugin({ directory }) {
       if (!sessionStarted) {
         sessionStarted = true;
         try { runPlugkit(['hook', 'session-start']); } catch(e) {}
-        try { runPlugkit(['bootstrap', directory]); } catch(e) {}
+        try { ensureSpoolWatcher(directory); } catch(e) {}
       }
       try { const rules = readFileSync(agentMd,'utf-8'); if (rules) output.system.unshift(rules); } catch(e) {}
       try {
@@ -132,7 +178,7 @@ export async function GmPlugin({ directory }) {
       if (!sessionStarted) {
         sessionStarted = true;
         try { runPlugkit(['hook', 'session-start']); } catch(e) {}
-        try { runPlugkit(['bootstrap', directory]); } catch(e) {}
+        try { ensureSpoolWatcher(directory); } catch(e) {}
       }
       const skillName = (args.skill || args.name || '').toString();
       if (FORBIDDEN_TOOLS.has(input.tool)) {

package/package.json

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