gm-oc 2.0.1060 → 2.0.1062

package/README.md

@@ -4,38 +4,59 @@
 
 ### One-liner (recommended)
 
-Install directly from npm using bun x:
+Install directly from npm:
 
 ```bash
 bun x gm-oc@latest
 ```
 
-This command will automatically install gm-oc to the correct location for your platform and restart OpenCode to activate.
+This copies the plugin to `~/.config/opencode/` and registers it in your config. Restart OpenCode to activate.
 
-### Manual installation
+### Via npm install
 
-**Windows and Unix:**
 ```bash
-git clone https://github.com/AnEntrypoint/gm-oc ~/.config/opencode/plugin && cd ~/.config/opencode/plugin && bun install
+npm install -g gm-oc
+gm-oc
 ```
 
-**Windows PowerShell:**
-```powershell
-git clone https://github.com/AnEntrypoint/gm-oc "\$env:APPDATA\opencode\plugin" && cd "\$env:APPDATA\opencode\plugin" && bun install
-```
+### Manual installation
 
-### Project-level
+Clone to the global plugin directory:
 
-**Windows and Unix:**
 ```bash
-git clone https://github.com/AnEntrypoint/gm-oc .opencode/plugins && cd .opencode/plugins && bun install
+git clone https://github.com/AnEntrypoint/gm-oc ~/.config/opencode/plugin
 ```
 
 ## Features
 
-- MCP tools for code execution and search
-- State machine agent policy (gm)
-- Git enforcement on session idle
-- AST analysis via thorns at session start
+- **State machine agent** — PLAN→EXECUTE→EMIT→VERIFY→COMPLETE orchestration
+- **Skill chain** — gm, planning, gm-execute, gm-emit, gm-complete, update-docs
+- **exec: dispatch** — code execution via spool watcher (nodejs, python, bash, typescript, go, rust)
+- **Code search** — semantic codebase exploration via exec:codesearch
+- **Git enforcement** — blocks session end with uncommitted changes or unpushed commits
+- **Memory** — rs-learn integration for cross-session knowledge retention
+
+## How it works
+
+The plugin installs:
+- **Agent** (`agents/gm.md`) — primary orchestrator with skill-chain instructions
+- **Skills** (`skills/`) — PLAN, EXECUTE, EMIT, VERIFY, UPDATE-DOCS skill definitions
+- **Plugin** (`plugins/gm-oc.mjs`) — hooks for session lifecycle, tool gating, exec: dispatch
+- **Lang runners** (`lang/`) — language-specific execution plugins
+
+All exec: commands route through the spool watcher at `.gm/exec-spool/` for session-isolated task execution.
+
+## Troubleshooting
+
+**Plugin not loading:**
+- Verify `~/.config/opencode/plugins/gm-oc.mjs` exists
+- Check `opencode.json` has the plugin path in the `plugin` array
+- Restart OpenCode completely
+
+**Skills not appearing:**
+- Verify `~/.config/opencode/skills/` contains skill directories with SKILL.md files
+- Skill names must be lowercase with hyphens (e.g., `gm`, `gm-execute`)
 
-The plugin activates automatically on session start.
+**exec: commands failing:**
+- Check `.gm/exec-spool/` directory exists in your project
+- Verify plugkit binary is present at `~/.config/opencode/bin/`

package/agents/gm.md

@@ -1,6 +1,6 @@
 ---
-name: gm
 description: Agent (not skill) - immutable programming state machine. Always invoke for all work coordination.
+mode: primary
 ---
 
 # GM — Skill-First Orchestrator

package/cli.js

@@ -36,19 +36,24 @@ try {
   copyRecursive(path.join(srcDir, 'scripts'), path.join(ocConfigDir, 'scripts'));
 
   const ocJsonPath = path.join(ocConfigDir, 'opencode.json');
+  const configExisted = fs.existsSync(ocJsonPath);
   let ocConfig = {};
-  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';
+  if (configExisted) {
+    try {
+      const raw = fs.readFileSync(ocJsonPath, 'utf-8');
+      ocConfig = JSON.parse(raw);
+      if (ocConfig['']) { delete ocConfig['']; }
+    } catch (e) {}
+  }
+  if (!configExisted) {
+    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 = [];
-  ocConfig.plugin = ocConfig.plugin.filter(p => !p.includes('gm-oc'));
-  ocConfig.plugin.push(pluginMjsPath);
+  if (!ocConfig.plugin.some(p => typeof p === 'string' && 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

@@ -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'];
@@ -57,6 +91,26 @@ export async function GmPlugin({ directory }) {
   const injectedSessions = new Set();
 
   return {
+    'session.created': async () => {
+      if (!sessionStarted) {
+        sessionStarted = true;
+        try { runPlugkit(['hook', 'session-start']); } 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) {}
+      }
+    },
+
     'experimental.chat.system.transform': async (input, output) => {
       const gmDir = join(directory, '.gm');
       try {
@@ -73,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 {
@@ -124,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-oc",
-  "version": "2.0.1060",
+  "version": "2.0.1062",
   "description": "State machine agent with hooks, skills, and automated git enforcement",
   "author": "AnEntrypoint",
   "license": "MIT",
@@ -30,9 +30,6 @@
     "access": "public"
   },
   "dependencies": {},
-  "scripts": {
-    "postinstall": "node scripts/postinstall-oc.js"
-  },
   "files": [
     "agents/",
     "bin/",

package/skills/gm/SKILL.md

@@ -2,17 +2,6 @@
 name: gm
 description: Orchestrator dispatching PLAN→EXECUTE→EMIT→VERIFY→UPDATE-DOCS skill chain; spool-driven task execution with session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-cc
-  - gm-gc
-  - gm-oc
-  - gm-kilo
-  - gm-codex
-  - gm-copilot-cli
-  - gm-vscode
-  - gm-cursor
-  - gm-zed
-  - gm-jetbrains
 end-to-end: true
 ---
 

package/skills/gm-cc/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-cc
 description: AI-native software engineering via skill-driven orchestration on cc; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-cc
 ---
 
 # GM — cc Platform

package/skills/gm-codex/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-codex
 description: AI-native software engineering via skill-driven orchestration on codex; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-codex
 ---
 
 # GM — codex Platform

package/skills/gm-copilot-cli/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-copilot-cli
 description: AI-native software engineering via skill-driven orchestration on copilot-cli; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-copilot-cli
 ---
 
 # GM — copilot-cli Platform

package/skills/gm-cursor/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-cursor
 description: AI-native software engineering via skill-driven orchestration on cursor; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-cursor
 ---
 
 # GM — cursor Platform

package/skills/gm-gc/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-gc
 description: AI-native software engineering via skill-driven orchestration on gc; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-gc
 ---
 
 # GM — gc Platform

package/skills/gm-jetbrains/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-jetbrains
 description: AI-native software engineering via skill-driven orchestration on jetbrains; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-jetbrains
 ---
 
 # GM — jetbrains Platform

package/skills/gm-kilo/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-kilo
 description: AI-native software engineering via skill-driven orchestration on kilo; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-kilo
 ---
 
 # GM — kilo Platform

package/skills/gm-oc/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-oc
 description: AI-native software engineering via skill-driven orchestration on oc; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-oc
 ---
 
 # GM — oc Platform

package/skills/gm-vscode/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-vscode
 description: AI-native software engineering via skill-driven orchestration on vscode; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-vscode
 ---
 
 # GM — vscode Platform

package/skills/gm-zed/SKILL.md

@@ -2,8 +2,6 @@
 name: gm-zed
 description: AI-native software engineering via skill-driven orchestration on zed; bootstraps plugkit for task execution and session isolation
 allowed-tools: Skill
-compatible-platforms:
-  - gm-zed
 ---
 
 # GM — zed Platform