toggle-oh-my 1.0.0 → 1.0.2

package/README.md

@@ -8,10 +8,10 @@ The plugin reads your opencode config (`~/.config/opencode/opencode.jsonc` or pr
 
 | State | plugin entry |
 |-------|-------------|
-| **ON** | `"oh-my-opencode@latest"` |
-| **OFF** | `"disabled_oh-my-opencode@latest"` |
+| **ON** | `"oh-my-openagent@latest"` (or `oh-my-opencode@latest`) |
+| **OFF** | `"disabled_oh-my-openagent@latest"` (or `disabled_oh-my-opencode@latest`) |
 
-The version string (`@latest`, `@1.2.3`, etc.) is preserved during the toggle, so you never lose the version pin.
+Both `oh-my-openagent` and `oh-my-opencode` names are supported (they are the same npm package). The version string (`@latest`, `@1.2.3`, etc.) is preserved during the toggle, so you never lose the version pin.
 
 ## Usage
 
@@ -31,10 +31,10 @@ Then add to your `opencode.json` / `opencode.jsonc`:
 
 ```json
 {
-  "plugin": ["toggle-oh-my", "oh-my-opencode@latest"]
+  "plugin": ["toggle-oh-my", "oh-my-openagent@latest"]
 }
 ```
 
 ## Compatibility
 
-Works with any version of oh-my-opencode. The version specifier (`@latest`, `@1.x`, etc.) is preserved through toggles.
+Works with any version (oh-my-openagent, oh-my-opencode). The version specifier (`@latest`, `@1.x`, etc.) is preserved through toggles.

package/index.js

@@ -1,16 +1,23 @@
 import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { homedir, platform } from 'os';
-import { join, sep } from 'path';
+import { join } from 'path';
 
-const PLUGIN_NAME = 'oh-my-opencode';
+const PLUGIN_NAMES = ['oh-my-openagent', 'oh-my-opencode'];
 const DISABLED_PREFIX = 'disabled_';
-const PLUGIN_DISPLAY = 'oh-my-opencode';
+const PLUGIN_DISPLAY = 'oh-my-openagent';
+
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 
 /**
- * Find and read the opencode config file that contains the plugin entry.
+ * 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'),
@@ -19,69 +26,89 @@ function findConfig() {
   for (const fp of projectCandidates) {
     if (!existsSync(fp)) continue;
     const raw = readFileSync(fp, 'utf-8');
-    if (raw.includes(PLUGIN_NAME) || raw.includes(DISABLED_PREFIX + PLUGIN_NAME)) {
+    if (hasAnyPlugin(raw)) {
       return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
     }
   }
 
-  // user-level: ~/.config/opencode/opencode.jsonc (or opencode.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'),
   ];
-  for (const fp of userCandidates) {
-    if (!existsSync(fp)) continue;
-    const raw = readFileSync(fp, 'utf-8');
-    return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : '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'),
+    );
   }
-
-  // Linux/macOS fallback: $XDG_CONFIG_HOME/opencode/opencode.jsonc
+  // Linux/macOS: $XDG_CONFIG_HOME
   if (platform() !== 'win32') {
     const xdg = process.env.XDG_CONFIG_HOME || join(home, '.config');
-    const fp = join(xdg, 'opencode', 'opencode.jsonc');
-    if (existsSync(fp)) {
+    userCandidates.push(join(xdg, 'opencode', 'opencode.jsonc'));
+  }
+
+  for (const fp of userCandidates) {
+    if (!existsSync(fp)) continue;
+    try {
       const raw = readFileSync(fp, 'utf-8');
-      return { path: fp, raw, format: 'jsonc' };
-    }
+      return { path: fp, raw, format: fp.endsWith('.jsonc') ? 'jsonc' : 'json' };
+    } catch { /* permission issue, try next */ }
   }
 
   return null;
 }
 
 /**
- * Toggle oh-my-opencode in the raw config text.
- * Uses regex to find the plugin string and toggle its name.
- * Preserves original formatting, comments, and whitespace.
+ * 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;
+    }
+  }
+  return null;
+}
+
+/**
+ * Toggle the plugin in the raw config text.
+ * Preserves version and original formatting.
  */
 function toggleInText(raw) {
-  // Match: "oh-my-opencode@version" or "disabled_oh-my-opencode@version"
-  // Captures: the full string including quotes, and the version part
+  const activeName = detectActiveName(raw);
+  if (!activeName) {
+    return { raw: null, newState: 'not-found', version: '' };
+  }
+
   const enabledPattern = new RegExp(
-    `"(${escapeRegex(PLUGIN_NAME)}(?:@[^"]*)?)"`,
+    `"(${escapeRegex(activeName)}(?:@[^"]*)?)"`,
     'g'
   );
   const disabledPattern = new RegExp(
-    `"(${escapeRegex(DISABLED_PREFIX)}${escapeRegex(PLUGIN_NAME)}(?:@[^"]*)?)"`,
+    `"(${escapeRegex(DISABLED_PREFIX)}${escapeRegex(activeName)}(?:@[^"]*)?)"`,
     'g'
   );
 
   let isCurrentlyEnabled = false;
   let version = '';
 
-  // Check if currently enabled
   let match;
   enabledPattern.lastIndex = 0;
   while ((match = enabledPattern.exec(raw)) !== null) {
     isCurrentlyEnabled = true;
-    // Extract version from the match
     const atIdx = match[1].indexOf('@');
     version = atIdx >= 0 ? match[1].slice(atIdx) : '';
     break;
   }
 
-  // Check if currently disabled
   disabledPattern.lastIndex = 0;
   let disabledVersion = '';
   while ((match = disabledPattern.exec(raw)) !== null) {
@@ -91,31 +118,23 @@ function toggleInText(raw) {
     break;
   }
 
-  let toggledText;
   if (isCurrentlyEnabled) {
-    // Toggle OFF: add disabled_ prefix
-    toggledText = raw.replace(
+    const toggledText = raw.replace(
       enabledPattern,
-      `"${DISABLED_PREFIX}${PLUGIN_NAME}${version}"`
+      `"${DISABLED_PREFIX}${activeName}${version}"`
     );
-    return { raw: toggledText, newState: 'disabled', version };
+    return { raw: toggledText, newState: 'disabled', version, activeName };
   } else if (disabledVersion !== '') {
-    // Toggle ON: remove disabled_ prefix
-    toggledText = raw.replace(
+    const toggledText = raw.replace(
       disabledPattern,
-      `"${PLUGIN_NAME}${disabledVersion}"`
+      `"${activeName}${disabledVersion}"`
     );
-    return { raw: toggledText, newState: 'enabled', version: disabledVersion };
+    return { raw: toggledText, newState: 'enabled', version: disabledVersion, activeName };
   }
 
-  // Not found in any form
   return { raw: null, newState: 'not-found', version: '' };
 }
 
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
 export const ToggleOhMyPlugin = async () => {
   return {
     config: async (opencodeConfig) => {
@@ -146,7 +165,7 @@ export const ToggleOhMyPlugin = async () => {
       if (result.newState === 'not-found') {
         output.parts = [{
           type: 'text',
-          text: `⚠️  "${PLUGIN_DISPLAY}" not found in ${configFile.path}. Nothing to toggle.`,
+          text: `⚠️  Plugin not found in ${configFile.path}. Nothing to toggle.`,
         }];
         return;
       }
@@ -154,9 +173,10 @@ export const ToggleOhMyPlugin = async () => {
       // Write the modified config back
       writeFileSync(configFile.path, result.raw, 'utf-8');
 
+      const name = result.activeName || PLUGIN_DISPLAY;
       const message = result.newState === 'enabled'
-        ? `✅ **${PLUGIN_DISPLAY}${result.version}** is now **ENABLED**\n   Restart opencode to apply.`
-        : `❌ **${PLUGIN_DISPLAY}${result.version}** is now **DISABLED**\n   Restart opencode to apply.`;
+        ? `✅ **${name}${result.version}** is now **ENABLED**\n   Restart opencode to apply.`
+        : `❌ **${name}${result.version}** is now **DISABLED**\n   Restart opencode to apply.`;
 
       output.parts = [{ type: 'text', text: message }];
     },

package/package.json

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