Merge pull request #1 from techdivision/develop

feat: v0.1.0 - User config directory support and singlerepo plugin fix

Author: wagnert

AGENTS.md

@@ -160,10 +160,10 @@ console.log(`${colors.green}  + ${message}${colors.reset}`);
 ### Plugin Discovery (lib/discovery.js)
 
 Plugins are discovered from two locations:
-1. **Global**: `npm config get prefix`/lib/node_modules/
+1. **User config**: `~/.config/opencode/node_modules/`
 2. **Local**: `{targetDir}/node_modules/`
 
-Priority: **last wins** (local overrides global)
+Priority: **last wins** (local overrides user)
 
 ### Plugin Types
 

CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.1.0] - 2025-03-04
+
+### Added
+- User config directory support (`~/.config/opencode/node_modules/`)
+- Direct linking to `~/.config/opencode` when running from user config directory
+- Skip `opencode.json` creation in user config directory (uses `config.json`)
+
+### Fixed
+- Singlerepo plugin source directory detection (use `descriptor.type` instead of `isUnified`)
+
+### Changed
+- Removed npm global prefix lookup - plugins are now discovered from user config and local only

bin/opencode-link.js

@@ -102,9 +102,29 @@ function formatPluginLabel(descriptor) {
 
 // Target directory for linking (set in main() after argument parsing)
 let TARGET_DIR = null;
+let TARGET_SOURCE = null;
 let PLUGINS = null;
 let CONTENT_TYPES = null;
 
+/**
+ * Gets the OpenCode user config directory path.
+ * 
+ * @returns {string} Path to ~/.config/opencode
+ */
+function getUserConfigDir() {
+  return path.join(os.homedir(), '.config', 'opencode');
+}
+
+/**
+ * Checks if the given directory is the OpenCode user config directory.
+ * 
+ * @param {string} dir - Directory to check
+ * @returns {boolean} True if dir is ~/.config/opencode
+ */
+function isUserConfigDir(dir) {
+  return path.resolve(dir) === getUserConfigDir();
+}
+
 /**
  * Searches for opencode.json starting from current directory and going up.
  */
@@ -124,15 +144,30 @@ function findOpencodeConfig() {
 
 /**
  * Resolves the target directory for linking.
+ * 
+ * Detection order:
+ * 1. CLI --target-dir flag
+ * 2. OpenCode user config directory (~/.config/opencode)
+ * 3. Directory with opencode.json (search upwards)
+ * 4. .opencode subdirectory
+ * 5. Default: {cwd}/.opencode
  */
 function resolveTargetDir(cliTargetDir) {
   if (cliTargetDir) {
+    const resolved = path.resolve(process.cwd(), cliTargetDir);
     return {
-      targetDir: path.resolve(process.cwd(), cliTargetDir),
-      source: 'cli',
+      targetDir: resolved,
+      source: isUserConfigDir(resolved) ? 'user-config' : 'cli',
     };
   }
 
+  const cwd = process.cwd();
+
+  // Check if we're in the OpenCode user config directory
+  if (isUserConfigDir(cwd)) {
+    return { targetDir: cwd, source: 'user-config' };
+  }
+
   const configDir = findOpencodeConfig();
   if (configDir) {
     return {
@@ -141,8 +176,6 @@ function resolveTargetDir(cliTargetDir) {
     };
   }
 
-  const cwd = process.cwd();
-
   // Check if we're already in a .opencode directory
   if (path.basename(cwd) === '.opencode') {
     return { targetDir: cwd, source: 'auto' };
@@ -199,15 +232,17 @@ function ensureDirectoryStructure() {
     }
   }
 
-  // Ensure opencode.json exists
-  const configPath = path.join(TARGET_DIR, 'opencode.json');
-  if (!fs.existsSync(configPath)) {
-    const defaultConfig = {
-      $schema: 'https://opencode.ai/config.json',
-      instructions: ['guideline/*.md'],
-    };
-    fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2) + '\n');
-    logSuccess('opencode.json created');
+  // Ensure opencode.json exists (skip for user-config directory which uses config.json)
+  if (TARGET_SOURCE !== 'user-config') {
+    const configPath = path.join(TARGET_DIR, 'opencode.json');
+    if (!fs.existsSync(configPath)) {
+      const defaultConfig = {
+        $schema: 'https://opencode.ai/config.json',
+        instructions: ['guideline/*.md'],
+      };
+      fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2) + '\n');
+      logSuccess('opencode.json created');
+    }
   }
 }
 
@@ -629,16 +664,19 @@ async function main() {
   // Resolve target directory
   const { targetDir, source } = resolveTargetDir(cliTargetDir);
   TARGET_DIR = targetDir;
+  TARGET_SOURCE = source;
 
-  // Discover plugins (global + local)
+  // Discover plugins
   PLUGINS = discoverPlugins(TARGET_DIR);
   CONTENT_TYPES = getContentTypes(PLUGINS);
 
   log('\nOpenCode Plugin Linker', 'bright');
   log('='.repeat(50), 'gray');
 
   // Show target directory info
-  if (source === 'cli') {
+  if (source === 'user-config') {
+    log(`Target: ${TARGET_DIR} (user config directory)`, 'cyan');
+  } else if (source === 'cli') {
     log(`Target: ${TARGET_DIR} (from --target-dir)`, 'cyan');
   } else if (source === 'auto') {
     log(`Target: ${TARGET_DIR} (auto-detected opencode.json)`, 'cyan');

lib/discovery.js

@@ -2,7 +2,7 @@
  * Plugin Discovery Module
  * 
  * Discovers OpenCode plugins from two locations (priority: last wins):
- * 1. Global: npm global prefix (npm install -g)
+ * 1. User config: ~/.config/opencode/node_modules/
  * 2. Local: {targetDir}/node_modules/
  * 
  * Each location can contain two types of packages:
@@ -13,52 +13,54 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { execSync } from 'child_process';
 
 /**
- * Gets the npm global prefix directory.
- * This is where `npm install -g` installs packages.
+ * Gets the user config directory for OpenCode plugins.
+ * This is where user-level plugins are installed.
  * 
- * @returns {string|null} Path to npm global prefix or null if not determinable
+ * @returns {string} Path to ~/.config/opencode/node_modules
  */
-function getGlobalDir() {
-  try {
-    const prefix = execSync('npm config get prefix', { encoding: 'utf-8' }).trim();
-    return path.join(prefix, 'lib', 'node_modules');
-  } catch {
-    return null;
-  }
+function getUserConfigDir() {
+  return path.join(os.homedir(), '.config', 'opencode', 'node_modules');
 }
 
 /**
  * Discovers all available plugins from all locations.
  * 
  * Priority (last wins):
- * 1. Global: npm global prefix (npm install -g)
+ * 1. User config: ~/.config/opencode/node_modules/
  * 2. Local: {targetDir}/node_modules/
  * 
+ * If targetDir is the user config directory (~/.config/opencode), only local
+ * is scanned to avoid duplicate scanning of the same directory.
+ * 
  * @param {string} targetDir - The .opencode directory (e.g., /project/.opencode)
  * @returns {Map<string, PluginDescriptor>} Map of plugin name to descriptor
  */
 export function discoverPlugins(targetDir) {
-  const globalDir = getGlobalDir();
+  const userConfigDir = getUserConfigDir();
+  const localNodeModules = path.join(targetDir, 'node_modules');
 
   // Scan all locations (order matters: last wins)
   const allPlugins = new Map();
 
-  // 1. Global (lowest priority)
-  if (globalDir) {
-    const globalPlugins = scanLocation(globalDir, 'global');
-    for (const [name, descriptor] of globalPlugins.entries()) {
+  // Check if local === user-config (when running from ~/.config/opencode)
+  const isUserConfigTarget = path.resolve(localNodeModules) === path.resolve(userConfigDir);
+  
+  // 1. User config (lower priority) - skip if same as local
+  if (!isUserConfigTarget) {
+    const userPlugins = scanLocation(userConfigDir, 'user');
+    for (const [name, descriptor] of userPlugins.entries()) {
       allPlugins.set(name, descriptor);
     }
   }
 
-  // 2. Local (highest priority)
-  const localPlugins = scanLocation(path.join(targetDir, 'node_modules'), 'local');
+  // 2. Local (highest priority) - labeled as 'user' if it's the user-config dir
+  const localLabel = isUserConfigTarget ? 'user' : 'local';
+  const localPlugins = scanLocation(localNodeModules, localLabel);
   for (const [name, descriptor] of localPlugins.entries()) {
     if (allPlugins.has(name)) {
-      console.log(`  ⚠️  Plugin "${name}" found in local, overrides global`);
+      console.log(`  ⚠️  Plugin "${name}" found in local, overrides user`);
     }
     allPlugins.set(name, descriptor);
   }

lib/linker.js

@@ -68,23 +68,23 @@ export function normalizeContentType(type) {
 /**
  * Gets source directory for a plugin based on type.
  * 
- * For unified plugins: content is in package root (agent/, command/, etc.)
- * For legacy plugins: content is in .opencode/ subdirectory
+ * For singlerepo plugins: content is in package root (agents/, commands/, etc.)
+ * For monorepo plugins: content is in .opencode/ subdirectory
  * 
  * @param {PluginDescriptor} descriptor - Plugin descriptor
- * @param {string} type - Content type (agent, command, skill, etc.)
+ * @param {string} type - Content type (agents, commands, skills, etc.)
  * @returns {string|null} Source directory path or null if not exists
  */
 export function getSourceDir(descriptor, type) {
   if (!descriptor.contentTypes.includes(type)) {
     return null;
   }
 
-  if (descriptor.isUnified) {
-    // Unified plugin: content in package root
+  if (descriptor.type === 'singlerepo') {
+    // Singlerepo plugin: content in package root
     return path.join(descriptor.rootDir, type);
   } else {
-    // Legacy plugin: content in .opencode/ subdirectory
+    // Monorepo plugin: content in .opencode/ subdirectory
     return path.join(descriptor.rootDir, '.opencode', type);
   }
 }