ocx 1.0.7 → 1.0.9

package/dist/index.js

@@ -13026,9 +13026,102 @@ var coerce = {
   date: (arg) => ZodDate.create({ ...arg, coerce: true })
 };
 var NEVER = INVALID;
+// src/utils/errors.ts
+var EXIT_CODES = {
+  SUCCESS: 0,
+  GENERAL: 1,
+  NOT_FOUND: 66,
+  NETWORK: 69,
+  CONFIG: 78,
+  INTEGRITY: 1
+};
+
+class OCXError extends Error {
+  code;
+  exitCode;
+  constructor(message, code, exitCode = EXIT_CODES.GENERAL) {
+    super(message);
+    this.code = code;
+    this.exitCode = exitCode;
+    this.name = "OCXError";
+  }
+}
+
+class NotFoundError extends OCXError {
+  constructor(message) {
+    super(message, "NOT_FOUND", EXIT_CODES.NOT_FOUND);
+    this.name = "NotFoundError";
+  }
+}
+
+class NetworkError extends OCXError {
+  constructor(message) {
+    super(message, "NETWORK_ERROR", EXIT_CODES.NETWORK);
+    this.name = "NetworkError";
+  }
+}
+
+class ConfigError extends OCXError {
+  constructor(message) {
+    super(message, "CONFIG_ERROR", EXIT_CODES.CONFIG);
+    this.name = "ConfigError";
+  }
+}
+
+class ValidationError extends OCXError {
+  constructor(message) {
+    super(message, "VALIDATION_ERROR", EXIT_CODES.GENERAL);
+    this.name = "ValidationError";
+  }
+}
+
+class ConflictError extends OCXError {
+  constructor(message) {
+    super(message, "CONFLICT", EXIT_CODES.GENERAL);
+    this.name = "ConflictError";
+  }
+}
+
+class IntegrityError extends OCXError {
+  constructor(component, expected, found) {
+    const message = `Integrity verification failed for "${component}"
+` + `  Expected: ${expected}
+` + `  Found:    ${found}
+
+` + `The registry content has changed since this component was locked.
+` + `This could indicate tampering or an unauthorized update.`;
+    super(message, "INTEGRITY_ERROR", EXIT_CODES.INTEGRITY);
+    this.name = "IntegrityError";
+  }
+}
+
 // src/schemas/registry.ts
 var openCodeNameSchema = exports_external.string().min(1, "Name cannot be empty").max(64, "Name cannot exceed 64 characters").regex(/^[a-z0-9]+(-[a-z0-9]+)*$/, {
-  message: "Must be lowercase alphanumeric with single hyphen separators (e.g., 'my-component', 'kdco-plan'). Cannot start/end with hyphen or have consecutive hyphens."
+  message: "Must be lowercase alphanumeric with single hyphen separators (e.g., 'my-component', 'my-plugin'). Cannot start/end with hyphen or have consecutive hyphens."
+});
+var namespaceSchema = openCodeNameSchema;
+var qualifiedComponentSchema = exports_external.string().regex(/^[a-z0-9]+(-[a-z0-9]+)*\/[a-z0-9]+(-[a-z0-9]+)*$/, {
+  message: 'Must be in format "namespace/component" (e.g., "kdco/librarian"). Both parts must be lowercase alphanumeric with hyphens.'
+});
+function parseQualifiedComponent(ref) {
+  if (!ref.includes("/")) {
+    throw new ValidationError(`Invalid component reference: "${ref}". Use format: namespace/component`);
+  }
+  const [namespace, component] = ref.split("/");
+  if (!namespace || !component) {
+    throw new ValidationError(`Invalid component reference: "${ref}". Both namespace and component are required.`);
+  }
+  return { namespace, component };
+}
+function createQualifiedComponent(namespace, component) {
+  return `${namespace}/${component}`;
+}
+var dependencyRefSchema = exports_external.string().refine((dep) => {
+  const barePattern = /^[a-z0-9]+(-[a-z0-9]+)*$/;
+  const qualifiedPattern = /^[a-z0-9]+(-[a-z0-9]+)*\/[a-z0-9]+(-[a-z0-9]+)*$/;
+  return barePattern.test(dep) || qualifiedPattern.test(dep);
+}, {
+  message: 'Dependency must be either a bare name (e.g., "utils") or qualified (e.g., "acme/utils")'
 });
 var componentTypeSchema = exports_external.enum([
   "ocx:agent",
@@ -13072,7 +13165,7 @@ var mcpServerObjectSchema = exports_external.object({
 }, {
   message: "Remote MCP servers require 'url', local servers require 'command'"
 });
-var mcpServerSchema = exports_external.union([exports_external.string().url(), mcpServerObjectSchema]);
+var mcpServerRefSchema = 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
@@ -13098,10 +13191,10 @@ var componentManifestSchema = exports_external.object({
   type: componentTypeSchema,
   description: exports_external.string().min(1).max(1024),
   files: exports_external.array(componentFileSchema),
-  dependencies: exports_external.array(openCodeNameSchema).default([]),
+  dependencies: exports_external.array(dependencyRefSchema).default([]),
   npmDependencies: exports_external.array(exports_external.string()).optional(),
   npmDevDependencies: exports_external.array(exports_external.string()).optional(),
-  mcpServers: exports_external.record(mcpServerSchema).optional(),
+  mcpServers: exports_external.record(mcpServerRefSchema).optional(),
   mcpScope: exports_external.enum(["agent", "global"]).default("agent"),
   opencode: opencodeConfigSchema.optional(),
   disabledTools: exports_external.array(exports_external.string()).optional()
@@ -13141,28 +13234,24 @@ function normalizeComponentManifest(manifest) {
 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"),
-  prefix: openCodeNameSchema,
+  namespace: namespaceSchema,
   version: exports_external.string().regex(semverRegex, {
     message: "Version must be valid semver (e.g., '1.0.0', '2.1.0-beta.1')"
   }),
   author: exports_external.string().min(1, "Author cannot be empty"),
   components: exports_external.array(componentManifestSchema)
-}).refine((data) => {
-  return data.components.every((c2) => c2.name.startsWith(`${data.prefix}-`));
-}, {
-  message: "All component names must start with the registry prefix"
 }).refine((data) => {
   const componentNames = new Set(data.components.map((c2) => c2.name));
   for (const component of data.components) {
     for (const dep of component.dependencies) {
-      if (!componentNames.has(dep)) {
+      if (!dep.includes("/") && !componentNames.has(dep)) {
         return false;
       }
     }
   }
   return true;
 }, {
-  message: "All dependencies must reference components that exist in the registry"
+  message: "Bare dependencies must reference components that exist in the registry. Use qualified references (e.g., 'other-registry/component') for cross-namespace dependencies."
 });
 var packumentSchema = exports_external.object({
   name: openCodeNameSchema,
@@ -13173,7 +13262,7 @@ var packumentSchema = exports_external.object({
 });
 var registryIndexSchema = exports_external.object({
   name: exports_external.string(),
-  prefix: openCodeNameSchema,
+  namespace: namespaceSchema,
   version: exports_external.string(),
   author: exports_external.string(),
   components: exports_external.array(exports_external.object({
@@ -13183,67 +13272,6 @@ var registryIndexSchema = exports_external.object({
   }))
 });
 
-// src/utils/errors.ts
-var EXIT_CODES = {
-  SUCCESS: 0,
-  GENERAL: 1,
-  NOT_FOUND: 66,
-  NETWORK: 69,
-  CONFIG: 78,
-  INTEGRITY: 1
-};
-
-class OCXError extends Error {
-  code;
-  exitCode;
-  constructor(message, code, exitCode = EXIT_CODES.GENERAL) {
-    super(message);
-    this.code = code;
-    this.exitCode = exitCode;
-    this.name = "OCXError";
-  }
-}
-
-class NotFoundError extends OCXError {
-  constructor(message) {
-    super(message, "NOT_FOUND", EXIT_CODES.NOT_FOUND);
-    this.name = "NotFoundError";
-  }
-}
-
-class NetworkError extends OCXError {
-  constructor(message) {
-    super(message, "NETWORK_ERROR", EXIT_CODES.NETWORK);
-    this.name = "NetworkError";
-  }
-}
-
-class ConfigError extends OCXError {
-  constructor(message) {
-    super(message, "CONFIG_ERROR", EXIT_CODES.CONFIG);
-    this.name = "ConfigError";
-  }
-}
-
-class ValidationError extends OCXError {
-  constructor(message) {
-    super(message, "VALIDATION_ERROR", EXIT_CODES.GENERAL);
-    this.name = "ValidationError";
-  }
-}
-class IntegrityError extends OCXError {
-  constructor(component, expected, found) {
-    const message = `Integrity verification failed for "${component}"
-` + `  Expected: ${expected}
-` + `  Found:    ${found}
-
-` + `The registry content has changed since this component was locked.
-` + `This could indicate tampering or an unauthorized update.`;
-    super(message, "INTEGRITY_ERROR", EXIT_CODES.INTEGRITY);
-    this.name = "IntegrityError";
-  }
-}
-
 // src/registry/fetcher.ts
 var cache = new Map;
 async function fetchWithCache(url, parse) {
@@ -13348,6 +13376,15 @@ function r2(e4, n3) {
 }
 
 // src/registry/resolver.ts
+function parseComponentRef(ref, defaultNamespace) {
+  if (ref.includes("/")) {
+    return parseQualifiedComponent(ref);
+  }
+  if (defaultNamespace) {
+    return { namespace: defaultNamespace, component: ref };
+  }
+  throw new ValidationError(`Component '${ref}' must include a namespace (e.g., 'kdco/${ref}')`);
+}
 async function resolveDependencies(registries, componentNames) {
   const resolved = new Map;
   const visiting = new Set;
@@ -13359,39 +13396,39 @@ async function resolveDependencies(registries, componentNames) {
   const plugins = new Set;
   const agentConfigs = {};
   const instructionsSet = new Set;
-  async function resolve2(name, path3 = []) {
-    if (resolved.has(name)) {
+  async function resolve2(componentNamespace, componentName, path3 = []) {
+    const qualifiedName = createQualifiedComponent(componentNamespace, componentName);
+    if (resolved.has(qualifiedName)) {
       return;
     }
-    if (visiting.has(name)) {
-      const cycle = [...path3, name].join(" \u2192 ");
+    if (visiting.has(qualifiedName)) {
+      const cycle = [...path3, qualifiedName].join(" \u2192 ");
       throw new ValidationError(`Circular dependency detected: ${cycle}`);
     }
-    visiting.add(name);
-    let component = null;
-    let foundRegistry = null;
-    const registryEntries = Object.entries(registries);
-    for (const [regName, regConfig] of registryEntries) {
-      try {
-        const manifest = await fetchComponent(regConfig.url, name);
-        component = manifest;
-        foundRegistry = { name: regName, url: regConfig.url };
-        break;
-      } catch (_err) {}
+    visiting.add(qualifiedName);
+    const regConfig = registries[componentNamespace];
+    if (!regConfig) {
+      throw new ConfigError(`Registry '${componentNamespace}' not configured. Add it to ocx.jsonc registries.`);
     }
-    if (!component || !foundRegistry) {
-      throw new OCXError(`Component '${name}' not found in any configured registry.`, "NOT_FOUND");
+    let component;
+    try {
+      component = await fetchComponent(regConfig.url, componentName);
+    } catch (_err) {
+      throw new OCXError(`Component '${componentName}' not found in registry '${componentNamespace}'.`, "NOT_FOUND");
     }
     for (const dep of component.dependencies) {
-      await resolve2(dep, [...path3, name]);
+      const depRef = parseComponentRef(dep, componentNamespace);
+      await resolve2(depRef.namespace, depRef.component, [...path3, qualifiedName]);
     }
     const normalizedComponent = normalizeComponentManifest(component);
-    resolved.set(name, {
+    resolved.set(qualifiedName, {
       ...normalizedComponent,
-      registryName: foundRegistry.name,
-      baseUrl: foundRegistry.url
+      namespace: componentNamespace,
+      registryName: componentNamespace,
+      baseUrl: regConfig.url,
+      qualifiedName
     });
-    visiting.delete(name);
+    visiting.delete(qualifiedName);
     if (normalizedComponent.mcpServers) {
       const serverNames = [];
       for (const [serverName, config2] of Object.entries(normalizedComponent.mcpServers)) {
@@ -13447,7 +13484,8 @@ async function resolveDependencies(registries, componentNames) {
     }
   }
   for (const name of componentNames) {
-    await resolve2(name);
+    const ref = parseComponentRef(name);
+    await resolve2(ref.namespace, ref.component);
   }
   const components = Array.from(resolved.values());
   const installOrder = Array.from(resolved.keys());
@@ -14803,14 +14841,15 @@ var installedComponentSchema = exports_external.object({
   registry: exports_external.string(),
   version: exports_external.string(),
   hash: exports_external.string(),
-  target: exports_external.string(),
-  installedAt: exports_external.string()
+  files: exports_external.array(exports_external.string()),
+  installedAt: exports_external.string(),
+  alias: exports_external.string().optional()
 });
 var ocxLockSchema = exports_external.object({
   lockVersion: exports_external.literal(1),
-  installed: exports_external.record(installedComponentSchema).default({})
+  installed: exports_external.record(qualifiedComponentSchema, installedComponentSchema).default({})
 });
-var opencodeMcpSchema = exports_external.record(mcpServerSchema);
+var opencodeMcpSchema = exports_external.record(mcpServerRefSchema);
 var opencodeAgentSchema = exports_external.object({
   disable: exports_external.boolean().optional(),
   tools: exports_external.record(exports_external.boolean()).optional(),
@@ -14906,12 +14945,21 @@ function applyMcpServers(content, config2, mcpServers) {
     if (server.type === "local" && server.command) {
       serverConfig.command = server.command;
     }
+    if (server.args) {
+      serverConfig.args = server.args;
+    }
     if (server.headers) {
       serverConfig.headers = server.headers;
     }
+    if (server.oauth !== undefined) {
+      serverConfig.oauth = server.oauth;
+    }
     if (server.enabled !== undefined) {
       serverConfig.enabled = server.enabled;
     }
+    if (server.environment) {
+      serverConfig.environment = server.environment;
+    }
     const edits = modify(updatedContent, ["mcp", name], serverConfig, JSONC_OPTIONS);
     updatedContent = applyEdits(updatedContent, edits);
     added.push(name);
@@ -16667,17 +16715,31 @@ async function runAdd(componentNames, options3) {
         files.push({ path: file.path, content: Buffer.from(content) });
       }
       const computedHash = await hashBundle(files);
-      const existingEntry = lock.installed[component.name];
+      const existingEntry = lock.installed[component.qualifiedName];
       if (existingEntry && existingEntry.hash !== computedHash) {
-        throw new IntegrityError(component.name, existingEntry.hash, computedHash);
+        throw new IntegrityError(component.qualifiedName, existingEntry.hash, computedHash);
+      }
+      for (const file of component.files) {
+        const targetPath = join2(cwd, file.target);
+        if (existsSync2(targetPath)) {
+          const conflictingComponent = findComponentByFile(lock, file.target);
+          if (conflictingComponent && conflictingComponent !== component.qualifiedName) {
+            throw new ConflictError(`File conflict: ${file.target} already exists (installed by '${conflictingComponent}').
+
+` + `To resolve:
+` + `  1. Remove existing: rm ${file.target}
+` + `  2. Or rename it manually and update references
+` + `  3. Then run: ocx add ${component.qualifiedName}`);
+          }
+        }
       }
       await installComponent(component, files, cwd);
       const index = await fetchRegistryIndex(component.baseUrl);
-      lock.installed[component.name] = {
+      lock.installed[component.qualifiedName] = {
         registry: component.registryName,
         version: index.version,
         hash: computedHash,
-        target: getTargetPath(component),
+        files: component.files.map((f2) => f2.target),
         installedAt: new Date().toISOString()
       };
     }
@@ -16763,10 +16825,6 @@ async function installComponent(component, files, cwd) {
     await writeFile(targetPath, file.content);
   }
 }
-function getTargetPath(component) {
-  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");
 }
@@ -16822,6 +16880,14 @@ async function installNpmDependencies(dependencies, devDependencies, cwd, option
     await run(parseNi, [...devDependencies, "-D"], { cwd });
   }
 }
+function findComponentByFile(lock, filePath) {
+  for (const [qualifiedName, entry] of Object.entries(lock.installed)) {
+    if (entry.files.includes(filePath)) {
+      return qualifiedName;
+    }
+  }
+  return null;
+}
 
 // src/commands/build.ts
 import { mkdir as mkdir2 } from "fs/promises";
@@ -16896,7 +16962,7 @@ function registerBuildCommand(program2) {
       }
       const index = {
         name: registry.name,
-        prefix: registry.prefix,
+        namespace: registry.namespace,
         version: registry.version,
         author: registry.author,
         components: registry.components.map((c2) => ({
@@ -17764,7 +17830,11 @@ function registerDiffCommand(program2) {
           }
           continue;
         }
-        const localPath = `${options3.cwd}/${installed.target}`;
+        if (!installed.files || installed.files.length === 0) {
+          logger.warn(`No files recorded for component '${name}'`);
+          continue;
+        }
+        const localPath = `${options3.cwd}/${installed.files[0]}`;
         const localFile = Bun.file(localPath);
         if (!await localFile.exists()) {
           results.push({ name, hasChanges: true, diff: "Local file missing" });
@@ -17777,14 +17847,16 @@ function registerDiffCommand(program2) {
           continue;
         }
         try {
-          const upstream = await fetchComponent(registryConfig.url, name);
+          const parsed = parseQualifiedComponent(name);
+          const componentName = parsed.component;
+          const upstream = await fetchComponent(registryConfig.url, componentName);
           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);
+          const upstreamContent = await fetchFileContent(registryConfig.url, componentName, upstreamFile.path);
           if (localContent === upstreamContent) {
             results.push({ name, hasChanges: false });
           } else {
@@ -18032,7 +18104,7 @@ function registerSearchCommand(program2) {
           }
           for (const comp of index.components) {
             allComponents.push({
-              name: comp.name,
+              name: `${index.namespace}/${comp.name}`,
               description: comp.description,
               type: comp.type,
               registry: registryName
@@ -18076,7 +18148,7 @@ function registerSearchCommand(program2) {
 }
 
 // src/index.ts
-var version2 = "1.0.7";
+var version2 = "1.0.9";
 async function main2() {
   const program2 = new Command().name("ocx").description("OpenCode Extensions - Install agents, skills, plugins, and commands").version(version2);
   registerInitCommand(program2);
@@ -18091,4 +18163,4 @@ main2().catch((err) => {
   handleError(err);
 });
 
-//# debugId=787522CA1BFEEB9464756E2164756E21
+//# debugId=8F8057E520B12DC364756E2164756E21