toggle-oh-my 1.0.2 → 1.0.3

package/index.js

@@ -2,23 +2,21 @@ import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { homedir, platform } from 'os';
 import { join } from 'path';
 
+// ============================================================
+// Core toggle logic (shared between server and TUI plugins)
+// ============================================================
+
 const PLUGIN_NAMES = ['oh-my-openagent', 'oh-my-opencode'];
 const DISABLED_PREFIX = 'disabled_';
-const PLUGIN_DISPLAY = 'oh-my-openagent';
 
 function escapeRegex(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
-/**
- * Find and read the opencode config file that contains any of the known plugin names.
- * Checks project-level config first, then user-level config.
- */
 function findConfig() {
   const hasAnyPlugin = (raw) =>
     PLUGIN_NAMES.some((n) => raw.includes(n) || raw.includes(DISABLED_PREFIX + n));
 
-  // project-level: <cwd>/.opencode/opencode.json
   const projectCandidates = [
     join(process.cwd(), '.opencode', 'opencode.json'),
     join(process.cwd(), '.opencode', 'opencode.jsonc'),
@@ -26,27 +24,19 @@ function findConfig() {
   for (const fp of projectCandidates) {
     if (!existsSync(fp)) continue;
     const raw = readFileSync(fp, 'utf-8');
-    if (hasAnyPlugin(raw)) {
-      return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
-    }
+    if (hasAnyPlugin(raw)) return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
   }
 
-  // user-level configs: check ALL known platform paths
   const home = homedir();
   const userCandidates = [
-    // Windows paths (opencode on Windows may use any of these)
     join(home, '.config', 'opencode', 'opencode.jsonc'),
     join(home, '.config', 'opencode', 'opencode.json'),
     join(home, '.opencode.json'),
   ];
-  // Windows: %APPDATA%/opencode/config.json
   if (platform() === 'win32' && process.env.APPDATA) {
-    userCandidates.push(
-      join(process.env.APPDATA, 'opencode', 'config.json'),
-      join(process.env.APPDATA, 'opencode', 'opencode.jsonc'),
-    );
+    userCandidates.push(join(process.env.APPDATA, 'opencode', 'config.json'));
+    userCandidates.push(join(process.env.APPDATA, 'opencode', 'opencode.jsonc'));
   }
-  // Linux/macOS: $XDG_CONFIG_HOME
   if (platform() !== 'win32') {
     const xdg = process.env.XDG_CONFIG_HOME || join(home, '.config');
     userCandidates.push(join(xdg, 'opencode', 'opencode.jsonc'));
@@ -55,132 +45,112 @@ function findConfig() {
   for (const fp of userCandidates) {
     if (!existsSync(fp)) continue;
     try {
-      const raw = readFileSync(fp, 'utf-8');
-      return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
-    } catch { /* permission issue, try next */ }
+      return { path: fp, raw: readFileSync(fp, 'utf-8'), format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
+    } catch { /* try next */ }
   }
-
   return null;
 }
 
-/**
- * Detect which plugin name is currently in the config (enabled or disabled).
- * Returns the actual name found, or null.
- */
 function detectActiveName(raw) {
   for (const name of PLUGIN_NAMES) {
-    const enabledRE = new RegExp(`"(${escapeRegex(name)}(?:@[^"]*)?)"`);
-    const disabledRE = new RegExp(`"(${escapeRegex(DISABLED_PREFIX)}${escapeRegex(name)}(?:@[^"]*)?)"`);
-    if (enabledRE.test(raw) || disabledRE.test(raw)) {
-      return name;
-    }
+    const re = new RegExp(`"(${escapeRegex(name)}|${escapeRegex(DISABLED_PREFIX)}${escapeRegex(name)})(?:@[^"]*)?"`);
+    if (re.test(raw)) return name;
   }
   return null;
 }
 
 /**
- * Toggle the plugin in the raw config text.
- * Preserves version and original formatting.
+ * Toggle the plugin name in the config text.
+ * Preserves version and original formatting via regex replacement.
  */
 function toggleInText(raw) {
   const activeName = detectActiveName(raw);
-  if (!activeName) {
-    return { raw: null, newState: 'not-found', version: '' };
-  }
+  if (!activeName) return { raw: null, newState: 'not-found', version: '' };
 
-  const enabledPattern = new RegExp(
-    `"(${escapeRegex(activeName)}(?:@[^"]*)?)"`,
-    'g'
-  );
-  const disabledPattern = new RegExp(
-    `"(${escapeRegex(DISABLED_PREFIX)}${escapeRegex(activeName)}(?:@[^"]*)?)"`,
-    'g'
-  );
-
-  let isCurrentlyEnabled = false;
-  let version = '';
-
-  let match;
-  enabledPattern.lastIndex = 0;
-  while ((match = enabledPattern.exec(raw)) !== null) {
-    isCurrentlyEnabled = true;
-    const atIdx = match[1].indexOf('@');
-    version = atIdx >= 0 ? match[1].slice(atIdx) : '';
-    break;
-  }
+  const enabledRE = new RegExp(`"(${escapeRegex(activeName)}(?:@[^"]*)?)"`, 'g');
+  const disabledRE = new RegExp(`"(${escapeRegex(DISABLED_PREFIX)}${escapeRegex(activeName)}(?:@[^"]*)?)"`, 'g');
 
-  disabledPattern.lastIndex = 0;
-  let disabledVersion = '';
-  while ((match = disabledPattern.exec(raw)) !== null) {
-    isCurrentlyEnabled = false;
-    const atIdx = match[1].indexOf('@');
-    disabledVersion = atIdx >= 0 ? match[1].slice(atIdx) : '';
-    break;
+  let m;
+  enabledRE.lastIndex = 0;
+  if ((m = enabledRE.exec(raw))) {
+    const version = m[1].includes('@') ? m[1].slice(m[1].indexOf('@')) : '';
+    return { raw: raw.replace(enabledRE, `"${DISABLED_PREFIX}${activeName}${version}"`), newState: 'disabled', version, activeName };
   }
 
-  if (isCurrentlyEnabled) {
-    const toggledText = raw.replace(
-      enabledPattern,
-      `"${DISABLED_PREFIX}${activeName}${version}"`
-    );
-    return { raw: toggledText, newState: 'disabled', version, activeName };
-  } else if (disabledVersion !== '') {
-    const toggledText = raw.replace(
-      disabledPattern,
-      `"${activeName}${disabledVersion}"`
-    );
-    return { raw: toggledText, newState: 'enabled', version: disabledVersion, activeName };
+  disabledRE.lastIndex = 0;
+  if ((m = disabledRE.exec(raw))) {
+    const version = m[1].includes('@') ? m[1].slice(m[1].indexOf('@')) : '';
+    return { raw: raw.replace(disabledRE, `"${activeName}${version}"`), newState: 'enabled', version, activeName };
   }
 
   return { raw: null, newState: 'not-found', version: '' };
 }
 
+// ============================================================
+// Server plugin (hooks) — registers in command palette
+// ============================================================
+
 export const ToggleOhMyPlugin = async () => {
   return {
     config: async (opencodeConfig) => {
-      // Register the /toggle-oh-my command
       opencodeConfig.command ??= {};
       opencodeConfig.command['toggle-oh-my'] = {
         template: '',
-        description: 'Toggle oh-my-opencode on/off (modified on next opencode restart)',
+        description: 'Toggle oh-my-openagent on/off (instant, no LLM needed)',
       };
     },
+  };
+};
 
-    'command.execute.before': async (input, output) => {
-      if (input.command !== 'toggle-oh-my') return;
-
-      const configFile = findConfig();
-      if (!configFile) {
-        output.parts = [{
-          type: 'text',
-          text: '❌ Could not find opencode config file. Checked:\n' +
-            '  - .opencode/opencode.json\n' +
-            '  - ~/.config/opencode/opencode.jsonc\n' +
-            '  - ~/.opencode.json',
-        }];
-        return;
-      }
+// ============================================================
+// TUI plugin — instant command without LLM involvement
+// Uses api.command.register to add a slash command with onSelect
+// ============================================================
 
-      const result = toggleInText(configFile.raw);
-      if (result.newState === 'not-found') {
-        output.parts = [{
-          type: 'text',
-          text: `⚠️  Plugin not found in ${configFile.path}. Nothing to toggle.`,
-        }];
-        return;
-      }
+async function performToggle(api) {
+  const file = findConfig();
+  if (!file) {
+    try { api.ui?.toast?.({ title: 'toggle-oh-my', body: 'Config file not found', type: 'error' }); } catch {}
+    return;
+  }
 
-      // Write the modified config back
-      writeFileSync(configFile.path, result.raw, 'utf-8');
+  const r = toggleInText(file.raw);
+  if (r.newState === 'not-found') {
+    try { api.ui?.toast?.({ title: 'toggle-oh-my', body: 'Plugin not found in config', type: 'warning' }); } catch {}
+    return;
+  }
 
-      const name = result.activeName || PLUGIN_DISPLAY;
-      const message = result.newState === 'enabled'
-        ? `✅ **${name}${result.version}** is now **ENABLED**\n   Restart opencode to apply.`
-        : `❌ **${name}${result.version}** is now **DISABLED**\n   Restart opencode to apply.`;
+  writeFileSync(file.path, r.raw, 'utf-8');
 
-      output.parts = [{ type: 'text', text: message }];
-    },
-  };
-};
+  const status = r.newState === 'enabled' ? 'ENABLED' : 'DISABLED';
+  const msg = `${r.activeName}${r.version} → ${status} (restart opencode to apply)`;
 
-export default ToggleOhMyPlugin;
+  try {
+    api.ui?.toast?.({ title: 'toggle-oh-my', body: msg, type: 'info' });
+  } catch {}
+}
+
+export default {
+  id: 'toggle-oh-my',
+  tui: async (api) => {
+    try {
+      const unregister = api.command.register(() => [
+        {
+          title: 'Toggle Oh My',
+          value: 'toggle-oh-my',
+          description: 'Toggle oh-my-openagent on/off instantly (restart to apply)',
+          category: 'Plugins',
+          slash: { name: 'toggle-oh-my' },
+          onSelect: () => performToggle(api),
+        },
+      ]);
+
+      // Cleanup on dispose
+      if (typeof unregister === 'function') {
+        // store for later cleanup if needed
+      }
+    } catch (e) {
+      console.error('toggle-oh-my TUI registration failed:', e);
+    }
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toggle-oh-my",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Opencode plugin to toggle oh-my-opencode on/off with a /toggle-oh-my command",
   "type": "module",
   "main": "index.js",