ocx 1.0.6 → 1.0.7

package/dist/index.js

@@ -4533,32 +4533,32 @@ var require_fuzzysort = __commonJS((exports, module) => {
     noResults.total = 0;
     var NULL = null;
     var noTarget = prepare("");
-    var fastpriorityqueue = (r2) => {
-      var e2 = [], o2 = 0, a3 = {}, v2 = (r3) => {
-        for (var a4 = 0, v3 = e2[a4], c2 = 1;c2 < o2; ) {
+    var fastpriorityqueue = (r3) => {
+      var e4 = [], o2 = 0, a3 = {}, v2 = (r4) => {
+        for (var a4 = 0, v3 = e4[a4], c2 = 1;c2 < o2; ) {
           var s2 = c2 + 1;
-          a4 = c2, s2 < o2 && e2[s2]._score < e2[c2]._score && (a4 = s2), e2[a4 - 1 >> 1] = e2[a4], c2 = 1 + (a4 << 1);
+          a4 = c2, s2 < o2 && e4[s2]._score < e4[c2]._score && (a4 = s2), e4[a4 - 1 >> 1] = e4[a4], c2 = 1 + (a4 << 1);
         }
-        for (var f2 = a4 - 1 >> 1;a4 > 0 && v3._score < e2[f2]._score; f2 = (a4 = f2) - 1 >> 1)
-          e2[a4] = e2[f2];
-        e2[a4] = v3;
+        for (var f2 = a4 - 1 >> 1;a4 > 0 && v3._score < e4[f2]._score; f2 = (a4 = f2) - 1 >> 1)
+          e4[a4] = e4[f2];
+        e4[a4] = v3;
       };
-      return a3.add = (r3) => {
+      return a3.add = (r4) => {
         var a4 = o2;
-        e2[o2++] = r3;
-        for (var v3 = a4 - 1 >> 1;a4 > 0 && r3._score < e2[v3]._score; v3 = (a4 = v3) - 1 >> 1)
-          e2[a4] = e2[v3];
-        e2[a4] = r3;
-      }, a3.poll = (r3) => {
+        e4[o2++] = r4;
+        for (var v3 = a4 - 1 >> 1;a4 > 0 && r4._score < e4[v3]._score; v3 = (a4 = v3) - 1 >> 1)
+          e4[a4] = e4[v3];
+        e4[a4] = r4;
+      }, a3.poll = (r4) => {
         if (o2 !== 0) {
-          var a4 = e2[0];
-          return e2[0] = e2[--o2], v2(), a4;
+          var a4 = e4[0];
+          return e4[0] = e4[--o2], v2(), a4;
         }
-      }, a3.peek = (r3) => {
+      }, a3.peek = (r4) => {
         if (o2 !== 0)
-          return e2[0];
-      }, a3.replaceTop = (r3) => {
-        e2[0] = r3, v2();
+          return e4[0];
+      }, a3.replaceTop = (r4) => {
+        e4[0] = r4, v2();
       }, a3;
     };
     var q2 = fastpriorityqueue();
@@ -13052,11 +13052,14 @@ var targetPathSchema = exports_external.string().refine((path3) => path3.startsW
 var skillTargetSchema = exports_external.string().regex(/^\.opencode\/skill\/[a-z0-9]+(-[a-z0-9]+)*\/SKILL\.md$/, {
   message: 'Skill target must match pattern ".opencode/skill/<name>/SKILL.md" where name follows OpenCode naming rules'
 });
-var mcpServerSchema = exports_external.object({
+var mcpServerObjectSchema = exports_external.object({
   type: exports_external.enum(["remote", "local"]),
   url: exports_external.string().url().optional(),
   command: exports_external.array(exports_external.string()).optional(),
+  args: exports_external.array(exports_external.string()).optional(),
+  environment: exports_external.record(exports_external.string()).optional(),
   headers: exports_external.record(exports_external.string()).optional(),
+  oauth: exports_external.boolean().optional(),
   enabled: exports_external.boolean().default(true)
 }).refine((data) => {
   if (data.type === "remote" && !data.url) {
@@ -13069,10 +13072,27 @@ var mcpServerSchema = exports_external.object({
 }, {
   message: "Remote MCP servers require 'url', local servers require 'command'"
 });
-var componentFileSchema = exports_external.object({
+var mcpServerSchema = exports_external.union([exports_external.string().url(), mcpServerObjectSchema]);
+var componentFileObjectSchema = exports_external.object({
   path: exports_external.string().min(1, "File path cannot be empty"),
   target: targetPathSchema
 });
+var componentFileSchema = exports_external.union([
+  exports_external.string().min(1, "File path cannot be empty"),
+  componentFileObjectSchema
+]);
+var agentConfigSchema = exports_external.object({
+  tools: exports_external.record(exports_external.boolean()).optional(),
+  temperature: exports_external.number().min(0).max(2).optional(),
+  prompt: exports_external.string().optional(),
+  permission: exports_external.record(exports_external.enum(["allow", "deny"])).optional()
+});
+var opencodeConfigSchema = exports_external.object({
+  plugins: exports_external.array(exports_external.string()).optional(),
+  tools: exports_external.record(exports_external.boolean()).optional(),
+  agent: exports_external.record(agentConfigSchema).optional(),
+  instructions: exports_external.array(exports_external.string()).optional()
+});
 var componentManifestSchema = exports_external.object({
   name: openCodeNameSchema,
   type: componentTypeSchema,
@@ -13083,8 +13103,41 @@ var componentManifestSchema = exports_external.object({
   npmDevDependencies: exports_external.array(exports_external.string()).optional(),
   mcpServers: exports_external.record(mcpServerSchema).optional(),
   mcpScope: exports_external.enum(["agent", "global"]).default("agent"),
+  opencode: opencodeConfigSchema.optional(),
   disabledTools: exports_external.array(exports_external.string()).optional()
 });
+function inferTargetPath(sourcePath) {
+  return `.opencode/${sourcePath}`;
+}
+function normalizeFile(file) {
+  if (typeof file === "string") {
+    return {
+      path: file,
+      target: inferTargetPath(file)
+    };
+  }
+  return file;
+}
+function normalizeMcpServer(server) {
+  if (typeof server === "string") {
+    return {
+      type: "remote",
+      url: server,
+      enabled: true
+    };
+  }
+  return server;
+}
+function normalizeComponentManifest(manifest) {
+  return {
+    ...manifest,
+    files: manifest.files.map(normalizeFile),
+    mcpServers: manifest.mcpServers ? Object.fromEntries(Object.entries(manifest.mcpServers).map(([name, server]) => [
+      name,
+      normalizeMcpServer(server)
+    ])) : undefined
+  };
+}
 var semverRegex = /^\d+\.\d+\.\d+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$/;
 var registrySchema = exports_external.object({
   name: exports_external.string().min(1, "Registry name cannot be empty"),
@@ -13252,6 +13305,48 @@ async function fetchFileContent(baseUrl, componentName, filePath) {
   return response.text();
 }
 
+// ../../node_modules/.bun/remeda@2.33.0/node_modules/remeda/dist/lazyDataLastImpl-DtF3cihj.js
+function e2(e3, t2, n2) {
+  let r2 = (n3) => e3(n3, ...t2);
+  return n2 === undefined ? r2 : Object.assign(r2, { lazy: n2, lazyArgs: t2 });
+}
+
+// ../../node_modules/.bun/remeda@2.33.0/node_modules/remeda/dist/purry-GjwKKIlp.js
+function t2(t3, n2, r2) {
+  let i2 = t3.length - n2.length;
+  if (i2 === 0)
+    return t3(...n2);
+  if (i2 === 1)
+    return e2(t3, n2, r2);
+  throw Error(`Wrong number of arguments`);
+}
+
+// ../../node_modules/.bun/remeda@2.33.0/node_modules/remeda/dist/isPlainObject.js
+function e3(e4) {
+  if (typeof e4 != `object` || !e4)
+    return false;
+  let t3 = Object.getPrototypeOf(e4);
+  return t3 === null || t3 === Object.prototype;
+}
+
+// ../../node_modules/.bun/remeda@2.33.0/node_modules/remeda/dist/mergeDeep.js
+function n2(...t3) {
+  return t2(r2, t3);
+}
+function r2(e4, n3) {
+  let i2 = { ...e4, ...n3 };
+  for (let a3 in n3) {
+    if (!(a3 in e4))
+      continue;
+    let { [a3]: o2 } = e4;
+    if (!e3(o2))
+      continue;
+    let { [a3]: s2 } = n3;
+    e3(s2) && (i2[a3] = r2(o2, s2));
+  }
+  return i2;
+}
+
 // src/registry/resolver.ts
 async function resolveDependencies(registries, componentNames) {
   const resolved = new Map;
@@ -13261,6 +13356,9 @@ async function resolveDependencies(registries, componentNames) {
   const npmDeps = new Set;
   const npmDevDeps = new Set;
   const disabledTools = new Set;
+  const plugins = new Set;
+  const agentConfigs = {};
+  const instructionsSet = new Set;
   async function resolve2(name, path3 = []) {
     if (resolved.has(name)) {
       return;
@@ -13287,15 +13385,16 @@ async function resolveDependencies(registries, componentNames) {
     for (const dep of component.dependencies) {
       await resolve2(dep, [...path3, name]);
     }
+    const normalizedComponent = normalizeComponentManifest(component);
     resolved.set(name, {
-      ...component,
+      ...normalizedComponent,
       registryName: foundRegistry.name,
       baseUrl: foundRegistry.url
     });
     visiting.delete(name);
-    if (component.mcpServers) {
+    if (normalizedComponent.mcpServers) {
       const serverNames = [];
-      for (const [serverName, config2] of Object.entries(component.mcpServers)) {
+      for (const [serverName, config2] of Object.entries(normalizedComponent.mcpServers)) {
         mcpServers[serverName] = config2;
         serverNames.push(serverName);
       }
@@ -13322,6 +13421,30 @@ async function resolveDependencies(registries, componentNames) {
         disabledTools.add(tool);
       }
     }
+    if (component.opencode) {
+      if (component.opencode.plugins) {
+        for (const plugin of component.opencode.plugins) {
+          plugins.add(plugin);
+        }
+      }
+      if (component.opencode.agent) {
+        for (const [agentName, config2] of Object.entries(component.opencode.agent)) {
+          agentConfigs[agentName] = n2(agentConfigs[agentName] ?? {}, config2);
+        }
+      }
+      if (component.opencode.instructions) {
+        for (const instruction of component.opencode.instructions) {
+          instructionsSet.add(instruction);
+        }
+      }
+      if (component.opencode.tools) {
+        for (const [tool, enabled] of Object.entries(component.opencode.tools)) {
+          if (enabled === false) {
+            disabledTools.add(tool);
+          }
+        }
+      }
+    }
   }
   for (const name of componentNames) {
     await resolve2(name);
@@ -13335,7 +13458,10 @@ async function resolveDependencies(registries, componentNames) {
     agentMcpBindings,
     npmDependencies: Array.from(npmDeps),
     npmDevDependencies: Array.from(npmDevDeps),
-    disabledTools: Array.from(disabledTools)
+    disabledTools: Array.from(disabledTools),
+    plugins: Array.from(plugins),
+    agentConfigs,
+    instructions: Array.from(instructionsSet)
   };
 }
 
@@ -14651,13 +14777,13 @@ function applyEdits(text2, edits) {
   });
   let lastModifiedOffset = text2.length;
   for (let i2 = sortedEdits.length - 1;i2 >= 0; i2--) {
-    let e2 = sortedEdits[i2];
-    if (e2.offset + e2.length <= lastModifiedOffset) {
-      text2 = applyEdit(text2, e2);
+    let e4 = sortedEdits[i2];
+    if (e4.offset + e4.length <= lastModifiedOffset) {
+      text2 = applyEdit(text2, e4);
     } else {
       throw new Error("Overlapping edit");
     }
-    lastModifiedOffset = e2.offset;
+    lastModifiedOffset = e4.offset;
   }
   return text2;
 }
@@ -14687,13 +14813,18 @@ var ocxLockSchema = exports_external.object({
 var opencodeMcpSchema = exports_external.record(mcpServerSchema);
 var opencodeAgentSchema = exports_external.object({
   disable: exports_external.boolean().optional(),
-  tools: exports_external.record(exports_external.boolean()).optional()
+  tools: exports_external.record(exports_external.boolean()).optional(),
+  temperature: exports_external.number().min(0).max(2).optional(),
+  prompt: exports_external.string().optional(),
+  permission: exports_external.record(exports_external.enum(["allow", "deny"])).optional()
 });
 var opencodeConfigPatchSchema = exports_external.object({
   default_agent: exports_external.string().optional(),
   mcp: opencodeMcpSchema.optional(),
   tools: exports_external.record(exports_external.boolean()).optional(),
-  agent: exports_external.record(opencodeAgentSchema).optional()
+  agent: exports_external.record(opencodeAgentSchema).optional(),
+  plugin: exports_external.array(exports_external.string()).optional(),
+  instructions: exports_external.array(exports_external.string()).optional()
 });
 var CONFIG_FILE = "ocx.jsonc";
 var LOCK_FILE = "ocx.lock";
@@ -14826,6 +14957,66 @@ function applyDefaultAgent(content, config2, defaultAgent) {
   const edits = modify(content, ["default_agent"], defaultAgent, JSONC_OPTIONS);
   return applyEdits(content, edits);
 }
+function applyPlugins(content, config2, plugins) {
+  const added = [];
+  let updatedContent = content;
+  const existingPlugins = config2.plugin ?? [];
+  for (const plugin of plugins) {
+    if (existingPlugins.includes(plugin)) {
+      continue;
+    }
+    const newIndex = existingPlugins.length + added.length;
+    const edits = modify(updatedContent, ["plugin", newIndex], plugin, JSONC_OPTIONS);
+    updatedContent = applyEdits(updatedContent, edits);
+    added.push(plugin);
+  }
+  return { content: updatedContent, added };
+}
+function applyAgentConfigs(content, existingConfig, agentConfigs) {
+  let updatedContent = content;
+  const agentsConfigured = [];
+  for (const [agentName, componentAgentConfig] of Object.entries(agentConfigs)) {
+    const existingAgentConfig = existingConfig.agent?.[agentName] ?? {};
+    const merged = n2(componentAgentConfig, existingAgentConfig);
+    if (merged.tools) {
+      for (const [toolPattern, enabled] of Object.entries(merged.tools)) {
+        const edits = modify(updatedContent, ["agent", agentName, "tools", toolPattern], enabled, JSONC_OPTIONS);
+        updatedContent = applyEdits(updatedContent, edits);
+      }
+    }
+    if (merged.temperature !== undefined) {
+      const edits = modify(updatedContent, ["agent", agentName, "temperature"], merged.temperature, JSONC_OPTIONS);
+      updatedContent = applyEdits(updatedContent, edits);
+    }
+    if (merged.prompt) {
+      const edits = modify(updatedContent, ["agent", agentName, "prompt"], merged.prompt, JSONC_OPTIONS);
+      updatedContent = applyEdits(updatedContent, edits);
+    }
+    if (merged.permission) {
+      for (const [pattern, permission] of Object.entries(merged.permission)) {
+        const edits = modify(updatedContent, ["agent", agentName, "permission", pattern], permission, JSONC_OPTIONS);
+        updatedContent = applyEdits(updatedContent, edits);
+      }
+    }
+    agentsConfigured.push(agentName);
+  }
+  return { content: updatedContent, agentsConfigured };
+}
+function applyInstructions(content, config2, instructions) {
+  const added = [];
+  let updatedContent = content;
+  const existingInstructions = config2.instructions ?? [];
+  for (const instruction of instructions) {
+    if (existingInstructions.includes(instruction)) {
+      continue;
+    }
+    const newIndex = existingInstructions.length + added.length;
+    const edits = modify(updatedContent, ["instructions", newIndex], instruction, JSONC_OPTIONS);
+    updatedContent = applyEdits(updatedContent, edits);
+    added.push(instruction);
+  }
+  return { content: updatedContent, added };
+}
 async function updateOpencodeConfig(cwd, options2) {
   const existing = await readOpencodeConfig(cwd);
   let content;
@@ -14846,6 +15037,8 @@ async function updateOpencodeConfig(cwd, options2) {
   let mcpSkipped = [];
   let agentsConfigured = [];
   let toolsDisabled = [];
+  let pluginsAdded = [];
+  let instructionsAdded = [];
   if (options2.mcpServers && Object.keys(options2.mcpServers).length > 0) {
     const result = applyMcpServers(content, config2, options2.mcpServers);
     content = result.content;
@@ -14869,6 +15062,24 @@ async function updateOpencodeConfig(cwd, options2) {
     content = applyDisabledTools(content, options2.disabledTools);
     toolsDisabled = options2.disabledTools;
   }
+  if (options2.plugins && options2.plugins.length > 0) {
+    const updatedConfig = parse2(content, [], { allowTrailingComma: true });
+    const result = applyPlugins(content, updatedConfig, options2.plugins);
+    content = result.content;
+    pluginsAdded = result.added;
+  }
+  if (options2.agentConfigs && Object.keys(options2.agentConfigs).length > 0) {
+    const updatedConfig = parse2(content, [], { allowTrailingComma: true });
+    const result = applyAgentConfigs(content, updatedConfig, options2.agentConfigs);
+    content = result.content;
+    agentsConfigured = [...new Set([...agentsConfigured, ...result.agentsConfigured])];
+  }
+  if (options2.instructions && options2.instructions.length > 0) {
+    const updatedConfig = parse2(content, [], { allowTrailingComma: true });
+    const result = applyInstructions(content, updatedConfig, options2.instructions);
+    content = result.content;
+    instructionsAdded = result.added;
+  }
   await writeOpencodeConfig(configPath, content);
   return {
     path: configPath,
@@ -14876,7 +15087,9 @@ async function updateOpencodeConfig(cwd, options2) {
     mcpAdded,
     mcpSkipped,
     agentsConfigured,
-    toolsDisabled
+    toolsDisabled,
+    pluginsAdded,
+    instructionsAdded
   };
 }
 
@@ -16471,11 +16684,17 @@ async function runAdd(componentNames, options3) {
     installSpin?.succeed(`Installed ${resolved.components.length} components`);
     const hasMcpChanges = Object.keys(resolved.mcpServers).length > 0 || resolved.agentMcpBindings.length > 0;
     const hasDisabledTools = resolved.disabledTools.length > 0;
-    if (hasMcpChanges || hasDisabledTools) {
+    const hasPlugins = resolved.plugins.length > 0;
+    const hasAgentConfigs = Object.keys(resolved.agentConfigs).length > 0;
+    const hasInstructions = resolved.instructions.length > 0;
+    if (hasMcpChanges || hasDisabledTools || hasPlugins || hasAgentConfigs || hasInstructions) {
       const result = await updateOpencodeConfig(cwd, {
         mcpServers: resolved.mcpServers,
         agentMcpBindings: resolved.agentMcpBindings,
-        disabledTools: resolved.disabledTools
+        disabledTools: resolved.disabledTools,
+        plugins: resolved.plugins,
+        agentConfigs: resolved.agentConfigs,
+        instructions: resolved.instructions
       });
       if (result.mcpSkipped.length > 0 && !options3.quiet) {
         for (const name of result.mcpSkipped) {
@@ -16491,6 +16710,15 @@ async function runAdd(componentNames, options3) {
       if (!options3.quiet && result.toolsDisabled.length > 0) {
         logger.info(`Disabled ${result.toolsDisabled.length} tools: ${result.toolsDisabled.join(", ")}`);
       }
+      if (!options3.quiet && result.pluginsAdded.length > 0) {
+        logger.info(`Added ${result.pluginsAdded.length} plugins: ${result.pluginsAdded.join(", ")}`);
+      }
+      if (!options3.quiet && result.agentsConfigured.length > 0) {
+        logger.info(`Configured ${result.agentsConfigured.length} agents: ${result.agentsConfigured.join(", ")}`);
+      }
+      if (!options3.quiet && result.instructionsAdded.length > 0) {
+        logger.info(`Added ${result.instructionsAdded.length} instructions`);
+      }
     }
     const hasNpmDeps = resolved.npmDependencies.length > 0;
     const hasNpmDevDeps = resolved.npmDevDependencies.length > 0;
@@ -16536,7 +16764,8 @@ async function installComponent(component, files, cwd) {
   }
 }
 function getTargetPath(component) {
-  return component.files[0]?.target ?? `.opencode/${component.type}/${component.name}`;
+  const typeDir = component.type.replace(/^ocx:/, "");
+  return component.files[0]?.target ?? `.opencode/${typeDir}/${component.name}`;
 }
 async function hashContent(content) {
   return createHash("sha256").update(content).digest("hex");
@@ -16619,7 +16848,7 @@ function registerBuildCommand(program2) {
       if (!parseResult.success) {
         if (!options3.json) {
           spinner2.fail("Registry validation failed");
-          const errors3 = parseResult.error.errors.map((e2) => `  ${e2.path.join(".")}: ${e2.message}`);
+          const errors3 = parseResult.error.errors.map((e4) => `  ${e4.path.join(".")}: ${e4.message}`);
           for (const err of errors3) {
             console.log(kleur_default.red(err));
           }
@@ -16642,7 +16871,8 @@ function registerBuildCommand(program2) {
         };
         const packumentPath = join3(componentsDir, `${component.name}.json`);
         await Bun.write(packumentPath, JSON.stringify(packument, null, 2));
-        for (const file of component.files) {
+        for (const rawFile of component.files) {
+          const file = normalizeFile(rawFile);
           const sourceFilePath = join3(sourcePath, "files", file.path);
           const destFilePath = join3(componentsDir, component.name, file.path);
           const destFileDir = dirname3(destFilePath);
@@ -17548,11 +17778,12 @@ function registerDiffCommand(program2) {
         }
         try {
           const upstream = await fetchComponent(registryConfig.url, name);
-          const upstreamFile = upstream.files[0];
-          if (!upstreamFile) {
+          const rawUpstreamFile = upstream.files[0];
+          if (!rawUpstreamFile) {
             results.push({ name, hasChanges: false });
             continue;
           }
+          const upstreamFile = normalizeFile(rawUpstreamFile);
           const upstreamContent = await fetchFileContent(registryConfig.url, name, upstreamFile.path);
           if (localContent === upstreamContent) {
             results.push({ name, hasChanges: false });
@@ -17822,7 +18053,7 @@ function registerSearchCommand(program2) {
           keys: ["name", "description"],
           limit
         });
-        results = fuzzyResults.map((r2) => r2.obj);
+        results = fuzzyResults.map((r3) => r3.obj);
       } else {
         results = results.slice(0, limit);
       }
@@ -17845,7 +18076,7 @@ function registerSearchCommand(program2) {
 }
 
 // src/index.ts
-var version2 = "1.0.6";
+var version2 = "1.0.7";
 async function main2() {
   const program2 = new Command().name("ocx").description("OpenCode Extensions - Install agents, skills, plugins, and commands").version(version2);
   registerInitCommand(program2);
@@ -17860,4 +18091,4 @@ main2().catch((err) => {
   handleError(err);
 });
 
-//# debugId=1145245802C7C7C964756E2164756E21
+//# debugId=787522CA1BFEEB9464756E2164756E21