gm-oc 2.0.340 → 2.0.342

package/cli.js

@@ -31,15 +31,23 @@ try {
   copyRecursive(path.join(srcDir, 'agents'), path.join(ocConfigDir, 'agents'));
   copyRecursive(path.join(srcDir, 'skills'), path.join(ocConfigDir, 'skills'));
   copyRecursive(path.join(srcDir, 'lang'), path.join(ocConfigDir, 'lang'));
+  copyRecursive(path.join(srcDir, 'bin'), path.join(ocConfigDir, 'bin'));
+  copyRecursive(path.join(srcDir, 'hooks'), path.join(ocConfigDir, 'hooks'));
 
   const ocJsonPath = path.join(ocConfigDir, 'opencode.json');
   let ocConfig = {};
-  try { ocConfig = JSON.parse(fs.readFileSync(ocJsonPath, 'utf-8')); } catch (e) {}
+  try {
+    const raw = fs.readFileSync(ocJsonPath, 'utf-8');
+    ocConfig = JSON.parse(raw);
+    if (ocConfig['']) { delete ocConfig['']; }
+  } catch (e) {}
   delete ocConfig.mcp;
+  ocConfig['$schema'] = 'https://opencode.ai/config.json';
   ocConfig.default_agent = 'gm';
   const pluginMjsPath = path.join(ocConfigDir, 'plugins', 'gm-oc.mjs');
   if (!Array.isArray(ocConfig.plugin)) ocConfig.plugin = [];
-  if (!ocConfig.plugin.includes(pluginMjsPath)) ocConfig.plugin.push(pluginMjsPath);
+  ocConfig.plugin = ocConfig.plugin.filter(p => !p.includes('gm-oc'));
+  ocConfig.plugin.push(pluginMjsPath);
   fs.writeFileSync(ocJsonPath, JSON.stringify(ocConfig, null, 2) + '\n');
 
   const oldDir = process.platform === 'win32'

package/gm-oc.mjs

@@ -5,67 +5,17 @@ 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__/"];
 const DOC_BLOCK_RE = /\.(md|txt)$/;
 
-function detectLang(src) {
-  if (/^\s*(import |from |export |const |let |var |function |class |async |await |console\.|process\.)/.test(src)) return 'nodejs';
-  if (/^\s*(import |def |print\(|class |if __name__)/.test(src)) return 'python';
-  return 'bash';
-}
-
-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());
-      return String(result === undefined ? '' : result);
-    }
-  } catch(e) {}
-  return null;
-}
-
-function runExec(rawLang, code, cwd) {
-  const lang = LANG_ALIASES[rawLang] || (rawLang || detectLang(code));
-  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));
-  const ext = lang === 'typescript' ? 'ts' : lang === 'bash' ? 'sh' : 'mjs';
-  const tmp = join(tmpdir(),'gm-plugin-'+Date.now()+'.'+ext);
-  const src = lang === 'bash' ? 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 = lang === 'bash' ? spawnSync('bash',[tmp],opts) : spawnSync('bun',['run',tmp],opts);
-  try { unlinkSync(tmp); } catch(e) {}
-  let result = out(r);
-  if (lang !== 'bash') result = result.split(tmp).join('<script>');
-  return result;
-}
-
-function safePrintf(s) {
-  return "printf '%s' '" + String(s).replace(/\\\\/g,'\\\\\\\\').replace(/'/g,"'\\\\''")+"'";
-}
-
-function runThorns(dir) {
+function runPlugkit(args) {
+  const bin = join(__dirname, '..', 'bin', 'plugkit.js');
+  if (!existsSync(bin)) return '';
   try {
-    const r = spawnSync('bun',['x','mcp-thorns@latest'],{encoding:'utf-8',timeout:15000,cwd:dir});
-    return r.killed ? '' : (r.stdout||'').trim();
-  } catch(e) { return ''; }
-}
-
-function runSearch(query, dir) {
-  try {
-    const r = spawnSync('bun',['x','codebasesearch',query],{encoding:'utf-8',timeout:10000,cwd:dir});
-    return (r.stdout||'').trim();
+    const r = spawnSync('node', [bin, ...args], { encoding: 'utf-8', timeout: 15000 });
+    return (r.stdout || '').trim() || (r.stderr || '').trim();
   } catch(e) { return ''; }
 }
 
@@ -76,6 +26,17 @@ export async function GmPlugin({ directory }) {
 
   return {
     'experimental.chat.system.transform': async (input, output) => {
+      try {
+        const giPath = join(directory, '.gitignore');
+        const entry = '.gm-stop-verified';
+        try {
+          let content = existsSync(giPath) ? readFileSync(giPath,'utf-8') : '';
+          if (!content.split('\n').some(l => l.trim() === entry)) {
+            const nc = (content.endsWith('\n') || content === '') ? content + entry + '\n' : content + '\n' + entry + '\n';
+            writeFileSync(giPath, nc, 'utf-8');
+          }
+        } catch(e) {}
+      } catch(e) {}
       try { const rules = readFileSync(agentMd,'utf-8'); if (rules) output.system.unshift(rules); } catch(e) {}
       try {
         if (existsSync(prdFile)) {
@@ -97,9 +58,12 @@ export async function GmPlugin({ directory }) {
       const prompt = textPart ? textPart.text.trim() : '';
       const parts = [];
       parts.push('Invoke the `gm` skill to begin. DO NOT use EnterPlanMode.');
-      const thorns = runThorns(directory);
-      if (thorns) parts.push('=== mcp-thorns ===\n'+thorns);
-      if (prompt) { const s = runSearch(prompt, directory); if (s) parts.push('=== codebasesearch ===\n'+s); }
+      const insight = runPlugkit(['codeinsight', directory]);
+      if (insight && !insight.startsWith('Error')) parts.push('=== codeinsight ===\n'+insight);
+      if (prompt) {
+        const search = runPlugkit(['search', '--path', directory, prompt]);
+        if (search && !search.startsWith('No results')) parts.push('=== search ===\n'+search);
+      }
       const injection = '<system-reminder>\n'+parts.join('\n\n')+'\n</system-reminder>';
       if (textPart) textPart.text = injection + '\n' + textPart.text;
       else if (msg.parts) msg.parts.unshift({ type: 'text', text: injection });
@@ -107,39 +71,41 @@ export async function GmPlugin({ directory }) {
 
     'tool.execute.before': async (input, output) => {
       if (FORBIDDEN_TOOLS.has(input.tool)) {
-        output.args = { ...output.args, command: safePrintf('Use the code-search skill for codebase exploration instead of '+input.tool+'. Describe what you need in plain language.') };
-        return;
+        throw new Error('Use the code-search skill for codebase exploration instead of '+input.tool+'. Describe what you need in plain language.');
       }
       if (input.tool === 'EnterPlanMode') {
-        output.args = { ...output.args, command: safePrintf('Plan mode is disabled. Use the gm skill (PLAN→EXECUTE→EMIT→VERIFY→COMPLETE state machine) instead.') };
-        return;
+        throw new Error('Plan mode is disabled. Use the gm skill (PLAN→EXECUTE→EMIT→VERIFY→COMPLETE state machine) instead.');
       }
       if (input.tool === 'Task' && input.args?.subagent_type === 'Explore') {
-        output.args = { ...output.args, command: safePrintf('The Explore agent is blocked. Use exec:codesearch in the Bash tool instead.\n\nexec:codesearch\n<natural language description of what to find>') };
-        return;
+        throw new Error('The Explore agent is blocked. Use exec:codesearch in the Bash tool instead.\n\nexec:codesearch\n<natural language description of what to find>');
       }
-      if (input.tool === 'write' || input.tool === 'Write') {
-        const fp = (output.args && output.args.file_path) || '';
+      if (input.tool === 'write' || input.tool === 'Write' || input.tool === 'edit') {
+        const fp = (output.args && output.args.file_path) || (input.args && input.args.file_path) || '';
         const base = basename(fp).toLowerCase();
         const ext = extname(fp);
         const blocked = FORBIDDEN_FILE_RE.some(re => re.test(base)) || FORBIDDEN_PATH_RE.some(p => fp.includes(p))
           || (DOC_BLOCK_RE.test(ext) && !base.startsWith('claude') && !base.startsWith('readme') && !fp.includes('/skills/'));
         if (blocked) {
-          output.args = { ...output.args, command: safePrintf('Cannot create test/doc files. Use .prd for task notes, CLAUDE.md for permanent notes.') };
-          return;
+          throw new Error('Cannot create test/doc files. Use .prd for task notes, CLAUDE.md for permanent notes.');
         }
       }
       if (input.tool !== 'bash') return;
-      const cmd = output.args && output.args.command;
+      const cmd = (output.args && output.args.command) || '';
       if (!cmd) return;
       if (/^\s*git(?:\s|$)/.test(cmd)) return;
       const m = cmd.match(/^exec(?::(\S+))?\n([\s\S]+)$/);
       if (!m) {
-        output.args = { ...output.args, command: safePrintf('Bash tool can only be used with exec syntax:\n\nexec[:lang]\n<command>\n\nExamples:\nexec\nls -la\n\nexec:nodejs\nnode -e "console.log(1)"') };
+        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 result = runExec(m[1]||'', m[2], output.args.workdir || directory);
-      output.args = { ...output.args, command: safePrintf('exec:'+(m[1]||'auto')+' output:\n\n'+result) };
+      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);
     }
   };
 }

package/hooks/hooks.json

@@ -1,30 +1,6 @@
 {
   "description": "Hooks for gm OpenCode extension",
   "hooks": {
-    "tool.execute.before": [
-      {
-        "matcher": "*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node ${OC_PLUGIN_ROOT}/bin/plugkit.js hook pre-tool-use",
-            "timeout": 3600
-          }
-        ]
-      }
-    ],
-    "session.created": [
-      {
-        "matcher": "*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node ${OC_PLUGIN_ROOT}/bin/plugkit.js hook session-start",
-            "timeout": 180000
-          }
-        ]
-      }
-    ],
     "message.updated": [
       {
         "matcher": "*",

package/opencode.json

@@ -1,4 +1,11 @@
 {
   "$schema": "https://opencode.ai/config.json",
-  "default_agent": "gm"
+  "default_agent": "gm",
+  "agent": {
+    "gm": {
+      "mode": "primary",
+      "description": "GM state machine agent — PLAN→EXECUTE→EMIT→VERIFY→COMPLETE",
+      "prompt": "{file:./agents/gm.md}"
+    }
+  }
 }

package/package.json

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

package/skills/gm/SKILL.md

@@ -72,6 +72,12 @@ exec:close
 <task_id>
 ```
 
+**When a task is backgrounded, you must monitor it — do not abandon it:**
+1. Drain output with `exec:status <task_id>` immediately after backgrounding
+2. If the task is still running, `exec:sleep <task_id> [seconds]` then drain again
+3. Repeat until the task exits or you have enough output to proceed
+4. `exec:close <task_id>` when the task is no longer needed
+
 **Runner management**:
 ```
 exec:runner