gm-oc 2.0.366 → 2.0.367

package/gm-oc.mjs

@@ -5,6 +5,7 @@ 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' };
 const FORBIDDEN_TOOLS = new Set(['glob','Glob','grep','Grep','search_file_content','Find','find']);
 const FORBIDDEN_FILE_RE = [/\.(test|spec)\.(js|ts|jsx|tsx|mjs|cjs)$/, /^(jest|vitest|mocha|ava|jasmine|tap)\.(config|setup)/, /\.(snap|stub|mock|fixture)\.(js|ts|json)$/];
 const FORBIDDEN_PATH_RE = ['/__tests__/','/test/','/tests/','/fixtures/','/test-data/',"/__mocks__/"];
@@ -19,6 +20,52 @@ function runPlugkit(args) {
   } catch(e) { return ''; }
 }
 
+function safePrintf(s) {
+  return "printf '%s' '" + String(s).replace(/\\\\/g,'\\\\\\\\').replace(/'/g,"'\\\\''")+"'";
+}
+
+function stripFooter(s) { return s ? s.replace(/\n\[Running tools\][\s\S]*$/, '').trimEnd() : ''; }
+
+function tryLangPlugin(lang, code, cwd) {
+  const langPluginDir = join(__dirname, '..', 'lang');
+  const langPluginFile = join(langPluginDir, lang+'.js');
+  if (!existsSync(langPluginFile)) return null;
+  try {
+    const plugin = require(langPluginFile);
+    if (plugin && plugin.exec && plugin.exec.run) {
+      const result = plugin.exec.run(code, cwd || process.cwd());
+      if (result && typeof result.then === 'function') return null;
+      return String(result === undefined ? '' : result);
+    }
+  } catch(e) {}
+  return null;
+}
+
+function runExecSync(rawLang, code, cwd) {
+  const lang = LANG_ALIASES[rawLang] || rawLang || 'nodejs';
+  const opts = { encoding: 'utf-8', timeout: 30000, ...(cwd && { cwd }) };
+  const out = (r) => { const o = (r.stdout||'').trimEnd(), e = stripFooter(r.stderr||'').trimEnd(); return o && e ? o+'\n[stderr]\n'+e : o||e||'(no output)'; };
+  const pluginResult = tryLangPlugin(lang, code, cwd);
+  if (pluginResult !== null) return pluginResult;
+  if (lang === 'python') return out(spawnSync('python3',['-c',code],opts));
+  if (lang === 'bash' || lang === 'sh') {
+    const tmp = join(tmpdir(),'gm-exec-'+Date.now()+'.sh');
+    writeFileSync(tmp,code,'utf-8');
+    const r = spawnSync('bash',[tmp],opts);
+    try { unlinkSync(tmp); } catch(e) {}
+    return out(r);
+  }
+  const ext = lang === 'typescript' ? 'ts' : 'mjs';
+  const tmp = join(tmpdir(),'gm-exec-'+Date.now()+'.'+ext);
+  const src = lang === 'typescript' ? code : 'const __r=await(async()=>{\n'+code+'\n})();if(__r!==undefined){if(typeof __r==="object"){console.log(JSON.stringify(__r,null,2));}else{console.log(__r);}}';
+  writeFileSync(tmp,src,'utf-8');
+  const r = spawnSync('bun',['run',tmp],opts);
+  try { unlinkSync(tmp); } catch(e) {}
+  let result = out(r);
+  if (result) result = result.split(tmp).join('<script>');
+  return result;
+}
+
 export async function GmPlugin({ directory }) {
   const agentMd = join(__dirname, '..', 'agents', 'gm.md');
   const prdFile = join(directory, '.prd');
@@ -98,14 +145,8 @@ export async function GmPlugin({ directory }) {
         output.args.command = "echo 'Bash tool can only be used with exec syntax:\n\nexec[:lang]\n<command>\n\nExamples:\nexec\nls -la\n\nexec:nodejs\nconsole.log(\"hello\")' 1>&2 && false";
         return;
       }
-      const lang = m[1] || 'nodejs';
-      const code = m[2];
-      const ext = lang === 'python' ? 'py' : lang === 'bash' || lang === 'sh' ? 'sh' : 'mjs';
-      const ts = Date.now();
-      const tmp = join(tmpdir(), 'plugkit-exec-' + ts + '.' + ext);
-      writeFileSync(tmp, code, 'utf-8');
-      const binJs = join(__dirname, '..', 'bin', 'plugkit.js');
-      output.args.command = 'node ' + binJs + ' exec --lang=' + lang + ' --file=' + tmp + ' --cwd=' + (output.args.workdir || directory);
+      const result = runExecSync(m[1]||'', m[2], output.args.workdir || directory);
+      output.args = { ...output.args, command: safePrintf('exec:'+(m[1]||'nodejs')+' output:\n\n'+result) };
     }
   };
 }

package/package.json

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