opencode-marketplace 0.4.1 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-marketplace",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "CLI marketplace for OpenCode plugins",
   "type": "module",
   "author": "nikiforovall",

package/src/cli.ts

@@ -6,6 +6,7 @@ import { list } from "./commands/list";
 import { scan } from "./commands/scan";
 import { uninstall } from "./commands/uninstall";
 import { update } from "./commands/update";
+import { setAgentsOverride } from "./config";
 
 export function run(argv = process.argv) {
   const cli = cac("opencode-marketplace");
@@ -19,11 +20,15 @@ export function run(argv = process.argv) {
     )
     .option("--force", "Overwrite existing components", { default: false })
     .option("-i, --interactive", "Interactively select components to install", { default: false })
+    .option("--agents", "Install skills to ~/.agents/skills/ (overrides config)")
     .action(async (path, options) => {
       if (options.scope !== "user" && options.scope !== "project") {
         console.error(`Invalid scope: ${options.scope}. Must be 'user' or 'project'.`);
         process.exit(1);
       }
+      if (options.agents) {
+        setAgentsOverride();
+      }
 
       try {
         await install(path, options);
@@ -41,18 +46,26 @@ export function run(argv = process.argv) {
     .command("import [config-path]", "Install plugins from import config file")
     .option("--target-dir <dir>", "Custom installation directory (overrides ~/.config/opencode)")
     .option("--force", "Overwrite existing components", { default: false })
+    .option("--agents", "Install skills to ~/.agents/skills/ (overrides config)")
     .action((configPath, options) => {
+      if (options.agents) {
+        setAgentsOverride();
+      }
       return importPlugins(configPath, options);
     });
 
   cli
     .command("uninstall <name>", "Uninstall a plugin")
     .option("--scope <scope>", "Installation scope (user/project)", { default: "user" })
+    .option("--agents", "Install skills to ~/.agents/skills/ (overrides config)")
     .action((name, options) => {
       if (options.scope !== "user" && options.scope !== "project") {
         console.error(`Invalid scope: ${options.scope}. Must be 'user' or 'project'.`);
         process.exit(1);
       }
+      if (options.agents) {
+        setAgentsOverride();
+      }
       return uninstall(name, options);
     });
 
@@ -76,11 +89,15 @@ export function run(argv = process.argv) {
   cli
     .command("update <name>", "Update a plugin from its remote source")
     .option("--scope <scope>", "Installation scope (user/project)", { default: "user" })
+    .option("--agents", "Install skills to ~/.agents/skills/ (overrides config)")
     .action((name, options) => {
       if (options.scope !== "user" && options.scope !== "project") {
         console.error(`Invalid scope: ${options.scope}. Must be 'user' or 'project'.`);
         process.exit(1);
       }
+      if (options.agents) {
+        setAgentsOverride();
+      }
       return update(name, options);
     });
 

package/src/commands/scan.ts

@@ -96,9 +96,9 @@ export async function scan(path: string, options: ScanOptions): Promise<void> {
       console.log("No components found.");
       console.log();
       console.log("Expected directories:");
-      console.log("  - .opencode/command/, .claude/commands/, command/, or commands/");
-      console.log("  - .opencode/agent/, .claude/agents/, agent/, or agents/");
-      console.log("  - .opencode/skill/, .claude/skills/, skill/, or skills/");
+      console.log("  - .opencode/commands/, .claude/commands/, commands/, or command/");
+      console.log("  - .opencode/agents/, .claude/agents/, agents/, or agent/");
+      console.log("  - .opencode/skills/, .claude/skills/, skills/, or skill/");
       return;
     }
 

package/src/config.ts

@@ -0,0 +1,65 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, normalize } from "node:path";
+import type { OcmConfig } from "./types";
+
+function getDefaultSkillsBase(): string {
+  return join(homedir(), ".agents");
+}
+
+let cachedConfig: OcmConfig | null = null;
+let agentsOverride = false;
+
+export function setAgentsOverride(): void {
+  agentsOverride = true;
+}
+
+export function getConfigPath(): string {
+  return join(homedir(), ".config", "opencode", "ocm-config.json");
+}
+
+export function loadConfig(): OcmConfig {
+  if (cachedConfig !== null) {
+    return cachedConfig;
+  }
+
+  const configPath = getConfigPath();
+
+  if (!existsSync(configPath)) {
+    cachedConfig = {};
+    return cachedConfig;
+  }
+
+  try {
+    const content = readFileSync(configPath, "utf-8");
+    const parsed = JSON.parse(content);
+    cachedConfig = {};
+
+    if (parsed && typeof parsed === "object" && typeof parsed.skillsPath === "string") {
+      let skillsPath = parsed.skillsPath;
+      if (skillsPath.startsWith("~/") || skillsPath === "~") {
+        skillsPath = join(homedir(), skillsPath.slice(2));
+      }
+      cachedConfig.skillsPath = normalize(skillsPath);
+    }
+
+    return cachedConfig;
+  } catch {
+    cachedConfig = {};
+    return cachedConfig;
+  }
+}
+
+export function resolveUserSkillsPath(): string {
+  if (agentsOverride) {
+    return join(getDefaultSkillsBase(), "skills");
+  }
+  const config = loadConfig();
+  const base = config.skillsPath || getDefaultSkillsBase();
+  return join(base, "skills");
+}
+
+export function resetConfigCache(): void {
+  cachedConfig = null;
+  agentsOverride = false;
+}

package/src/discovery.ts

@@ -5,9 +5,9 @@ import type { ComponentType, DiscoveredComponent } from "./types";
 import { getComponentTargetName } from "./types";
 
 const SEARCH_PATHS: Record<ComponentType, string[]> = {
-  command: [".opencode/command", ".claude/commands", "command", "commands"],
-  agent: [".opencode/agent", ".claude/agents", "agent", "agents"],
-  skill: [".opencode/skill", ".claude/skills", "skill", "skills"],
+  command: [".opencode/commands", ".claude/commands", "commands", "command"],
+  agent: [".opencode/agents", ".claude/agents", "agents", "agent"],
+  skill: [".opencode/skills", ".claude/skills", "skills", "skill"],
 };
 
 /**

package/src/paths.ts

@@ -1,22 +1,32 @@
 import { mkdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join, normalize } from "node:path";
+import { resolveUserSkillsPath } from "./config";
 import type { ComponentType, Scope } from "./types";
 import { getComponentTargetName } from "./types";
 
+function pluralizeType(type: ComponentType): string {
+  return `${type}s`;
+}
+
 /**
  * Returns the base directory for a component type with trailing slash.
  * Examples:
- *   - User scope: "~/.config/opencode/command/"
- *   - Project scope: ".opencode/command/"
+ *   - User scope: "~/.config/opencode/commands/", "~/.agents/skills/"
+ *   - Project scope: ".opencode/commands/"
  */
 export function getComponentDir(type: ComponentType, scope: Scope, targetDir?: string): string {
-  const basePath =
-    scope === "user"
-      ? join(targetDir || join(homedir(), ".config", "opencode"), type)
-      : join(process.cwd(), ".opencode", type);
+  if (scope === "user") {
+    if (targetDir) {
+      return `${normalize(join(targetDir, pluralizeType(type)))}/`;
+    }
+    if (type === "skill") {
+      return `${normalize(resolveUserSkillsPath())}/`;
+    }
+    return `${normalize(join(homedir(), ".config", "opencode", pluralizeType(type)))}/`;
+  }
 
-  return `${normalize(basePath)}/`;
+  return `${normalize(join(process.cwd(), ".opencode", pluralizeType(type)))}/`;
 }
 
 /**
@@ -24,8 +34,8 @@ export function getComponentDir(type: ComponentType, scope: Scope, targetDir?: s
  * Handles both files (commands/agents) and directories (skills).
  *
  * Examples:
- *   - Command: "~/.config/opencode/command/myplugin--reflect.md"
- *   - Skill: "~/.config/opencode/skill/myplugin--code-review/"
+ *   - Command: "~/.config/opencode/commands/myplugin--reflect.md"
+ *   - Skill: "~/.agents/skills/myplugin--code-review/"
  */
 export function getComponentTargetPath(
   pluginName: string,
@@ -47,7 +57,7 @@ export function getComponentTargetPath(
 }
 
 /**
- * Ensures all component directories (command, agent, skill) exist for the given scope.
+ * Ensures all component directories (commands, agents, skills) exist for the given scope.
  * Idempotent - safe to call multiple times.
  */
 export async function ensureComponentDirsExist(scope: Scope, targetDir?: string): Promise<void> {

package/src/types.ts

@@ -48,6 +48,10 @@ export interface ImportConfig {
   plugins: string[];
 }
 
+export interface OcmConfig {
+  skillsPath?: string;
+}
+
 // Validation & Helpers
 
 /**