ocx 1.4.1 → 1.4.2

package/dist/index.js

@@ -9824,7 +9824,8 @@ var EXIT_CODES = {
   NOT_FOUND: 66,
   NETWORK: 69,
   CONFIG: 78,
-  INTEGRITY: 1
+  INTEGRITY: 1,
+  CONFLICT: 6
 };
 
 class OCXError extends Error {
@@ -9868,7 +9869,7 @@ class ValidationError extends OCXError {
 
 class ConflictError extends OCXError {
   constructor(message) {
-    super(message, "CONFLICT", EXIT_CODES.GENERAL);
+    super(message, "CONFLICT", EXIT_CODES.CONFLICT);
     this.name = "ConflictError";
   }
 }
@@ -9909,11 +9910,32 @@ class ProfileNotFoundError extends OCXError {
 
 class ProfileExistsError extends OCXError {
   constructor(name) {
-    super(`Profile "${name}" already exists`, "CONFLICT", EXIT_CODES.GENERAL);
+    super(`Profile "${name}" already exists. Use --force to overwrite.`, "CONFLICT", EXIT_CODES.CONFLICT);
     this.name = "ProfileExistsError";
   }
 }
 
+class RegistryExistsError extends OCXError {
+  registryName;
+  existingUrl;
+  newUrl;
+  targetLabel;
+  constructor(registryName, existingUrl, newUrl, targetLabel) {
+    const target = targetLabel ? ` in ${targetLabel}` : "";
+    const message = `Registry "${registryName}" already exists${target}.
+` + `  Current: ${existingUrl}
+` + `  New:     ${newUrl}
+
+` + `Use --force to overwrite.`;
+    super(message, "CONFLICT", EXIT_CODES.CONFLICT);
+    this.registryName = registryName;
+    this.existingUrl = existingUrl;
+    this.newUrl = newUrl;
+    this.targetLabel = targetLabel;
+    this.name = "RegistryExistsError";
+  }
+}
+
 class InvalidProfileNameError extends OCXError {
   constructor(name, reason) {
     super(`Invalid profile name "${name}": ${reason}`, "VALIDATION_ERROR", EXIT_CODES.GENERAL);
@@ -9923,7 +9945,7 @@ class InvalidProfileNameError extends OCXError {
 
 class ProfilesNotInitializedError extends OCXError {
   constructor() {
-    super("Profiles not initialized. Run 'ocx profile add default' first.", "NOT_FOUND", EXIT_CODES.NOT_FOUND);
+    super("Profiles not initialized. Run 'ocx init --global' first.", "NOT_FOUND", EXIT_CODES.NOT_FOUND);
     this.name = "ProfilesNotInitializedError";
   }
 }
@@ -10399,7 +10421,7 @@ class GlobalConfigProvider {
   static async requireInitialized() {
     const basePath = getGlobalConfigPath();
     if (!await globalDirectoryExists()) {
-      throw new ConfigError("Global config not found. Run 'opencode' once to initialize, then retry.");
+      throw new ConfigError("Global config not found. Run 'ocx init --global' first.");
     }
     const config = await readOcxConfig(basePath);
     return new GlobalConfigProvider(basePath, config);
@@ -10626,7 +10648,25 @@ class ProfileManager {
     const dir = getProfileDir(name);
     await mkdir2(dir, { recursive: true, mode: 448 });
     const ocxPath = getProfileOcxConfig(name);
-    await atomicWrite(ocxPath, DEFAULT_OCX_CONFIG);
+    const ocxFile = Bun.file(ocxPath);
+    if (!await ocxFile.exists()) {
+      await atomicWrite(ocxPath, DEFAULT_OCX_CONFIG);
+    }
+    const opencodePath = getProfileOpencodeConfig(name);
+    const opencodeFile = Bun.file(opencodePath);
+    if (!await opencodeFile.exists()) {
+      await atomicWrite(opencodePath, {});
+    }
+    const agentsPath = getProfileAgents(name);
+    const agentsFile = Bun.file(agentsPath);
+    if (!await agentsFile.exists()) {
+      const agentsContent = `# Profile Instructions
+
+<!-- Add your custom instructions for this profile here -->
+<!-- These will be included when running \`ocx opencode -p ${name}\` -->
+`;
+      await Bun.write(agentsPath, agentsContent, { mode: 384 });
+    }
   }
   async remove(name) {
     if (!await this.exists(name)) {
@@ -10765,11 +10805,13 @@ class ConfigResolver {
       }
     }
     const shouldLoadLocal = this.shouldLoadLocalConfig();
-    if (shouldLoadLocal && this.localConfigDir) {
+    if (!this.profile && shouldLoadLocal && this.localConfigDir) {
       const localOcxConfig = this.loadLocalOcxConfig();
       if (localOcxConfig) {
-        registries = { ...registries, ...localOcxConfig.registries };
+        registries = localOcxConfig.registries;
       }
+    }
+    if (shouldLoadLocal && this.localConfigDir) {
       const localOpencodeConfig = this.loadLocalOpencodeConfig();
       if (localOpencodeConfig) {
         opencode = this.deepMerge(opencode, localOpencodeConfig);
@@ -10810,7 +10852,7 @@ class ConfigResolver {
       }
     }
     const shouldLoadLocal = this.shouldLoadLocalConfig();
-    if (shouldLoadLocal && this.localConfigDir) {
+    if (!this.profile && shouldLoadLocal && this.localConfigDir) {
       const localOcxConfig = this.loadLocalOcxConfig();
       if (localOcxConfig) {
         const localOcxPath = join2(this.localConfigDir, OCX_CONFIG_FILE);
@@ -10819,6 +10861,8 @@ class ConfigResolver {
           origins.set(`registries.${key}`, { path: localOcxPath, source: "local-config" });
         }
       }
+    }
+    if (shouldLoadLocal && this.localConfigDir) {
       const localOpencodeConfig = this.loadLocalOpencodeConfig();
       if (localOpencodeConfig) {
         opencode = this.deepMerge(opencode, localOpencodeConfig);
@@ -10938,7 +10982,7 @@ class ConfigResolver {
 // package.json
 var package_default = {
   name: "ocx",
-  version: "1.4.1",
+  version: "1.4.2",
   description: "OCX CLI - ShadCN-style registry for OpenCode extensions. Install agents, plugins, skills, and MCP servers.",
   author: "kdcokenny",
   license: "MIT",
@@ -11632,6 +11676,25 @@ function wrapAction(action) {
   };
 }
 function formatErrorAsJson(error) {
+  if (error instanceof RegistryExistsError) {
+    return {
+      success: false,
+      error: {
+        code: error.code,
+        message: error.message,
+        details: {
+          registryName: error.registryName,
+          existingUrl: error.existingUrl,
+          newUrl: error.newUrl,
+          ...error.targetLabel && { targetLabel: error.targetLabel }
+        }
+      },
+      exitCode: error.exitCode,
+      meta: {
+        timestamp: new Date().toISOString()
+      }
+    };
+  }
   if (error instanceof OCXError) {
     return {
       success: false,
@@ -11695,6 +11758,7 @@ var sharedOptions = {
   cwd: () => new Option("--cwd <path>", "Working directory").default(process.cwd()),
   quiet: () => new Option("-q, --quiet", "Suppress output"),
   json: () => new Option("--json", "Output as JSON"),
+  profile: () => new Option("-p, --profile <name>", "Target a specific profile's config"),
   force: () => new Option("-f, --force", "Skip confirmation prompts"),
   verbose: () => new Option("-v, --verbose", "Verbose output"),
   global: new Option("-g, --global", "Install to global OpenCode config (~/.config/opencode)")
@@ -11711,6 +11775,20 @@ function addVerboseOption(cmd) {
 function addGlobalOption(cmd) {
   return cmd.addOption(sharedOptions.global);
 }
+function addProfileOption(cmd) {
+  return cmd.addOption(sharedOptions.profile());
+}
+function validateProfileName(name) {
+  if (!name || name.length === 0) {
+    throw new InvalidProfileNameError(name, "cannot be empty");
+  }
+  if (name.length > 32) {
+    throw new InvalidProfileNameError(name, "must be 32 characters or less");
+  }
+  if (!/^[a-zA-Z][a-zA-Z0-9._-]*$/.test(name)) {
+    throw new InvalidProfileNameError(name, "must start with a letter and contain only alphanumeric characters, dots, underscores, or hyphens");
+  }
+}
 // ../../node_modules/.bun/ora@8.2.0/node_modules/ora/index.js
 import process9 from "process";
 
@@ -13861,7 +13939,7 @@ import { existsSync as existsSync6 } from "fs";
 import { mkdir as mkdir6 } from "fs/promises";
 import { join as join6 } from "path";
 function registerConfigEditCommand(parent) {
-  parent.command("edit").description("Open configuration file in editor").option("-g, --global", "Edit global ocx.jsonc").action(async (options2) => {
+  parent.command("edit").description("Open configuration file in editor").option("-g, --global", "Edit global ocx.jsonc").option("-p, --profile <name>", "Edit specific profile's config").action(async (options2) => {
     try {
       await runConfigEdit(options2);
     } catch (error) {
@@ -13870,12 +13948,26 @@ function registerConfigEditCommand(parent) {
   });
 }
 async function runConfigEdit(options2) {
+  if (options2.global && options2.profile) {
+    throw new ValidationError("Cannot use both --global and --profile flags");
+  }
   let configPath;
-  if (options2.global) {
+  if (options2.profile) {
+    const parseResult = profileNameSchema.safeParse(options2.profile);
+    if (!parseResult.success) {
+      throw new ValidationError(`Invalid profile name "${options2.profile}": ${parseResult.error.errors[0]?.message ?? "Invalid name"}`);
+    }
+    await ProfileManager.requireInitialized();
+    const manager = ProfileManager.create();
+    if (!await manager.exists(options2.profile)) {
+      throw new ProfileNotFoundError(options2.profile);
+    }
+    configPath = getProfileOcxConfig(options2.profile);
+  } else if (options2.global) {
     configPath = getGlobalConfig();
     if (!existsSync6(configPath)) {
       throw new ConfigError(`Global config not found at ${configPath}.
-` + "Run 'opencode' once to initialize, then retry.");
+Run 'ocx init --global' first.`);
     }
   } else {
     const localConfigDir = findLocalConfigDir(process.cwd());
@@ -15291,34 +15383,90 @@ async function runInit(options2) {
   }
 }
 async function runInitGlobal(options2) {
-  const manager = ProfileManager.create();
-  if (await manager.isInitialized()) {
-    const profilesDir = getProfilesDir();
-    throw new ProfileExistsError(`Global profiles already initialized at ${profilesDir}`);
-  }
   const spin = options2.quiet ? null : createSpinner({ text: "Initializing global profiles..." });
   spin?.start();
   try {
-    await manager.initialize();
+    const created = [];
+    const existed = [];
+    const globalConfigPath = getGlobalConfig();
+    if (existsSync8(globalConfigPath)) {
+      existed.push("globalConfig");
+    } else {
+      await mkdir7(dirname3(globalConfigPath), { recursive: true, mode: 448 });
+      await atomicWrite(globalConfigPath, {
+        $schema: OCX_SCHEMA_URL,
+        registries: {}
+      });
+      created.push("globalConfig");
+    }
     const profilesDir = getProfilesDir();
-    const ocxConfigPath = getProfileOcxConfig("default");
+    if (!existsSync8(profilesDir)) {
+      await mkdir7(profilesDir, { recursive: true, mode: 448 });
+    }
+    const profileDir = getProfileDir("default");
+    if (!existsSync8(profileDir)) {
+      await mkdir7(profileDir, { recursive: true, mode: 448 });
+    }
+    const ocxPath = getProfileOcxConfig("default");
+    if (existsSync8(ocxPath)) {
+      existed.push("profileOcx");
+    } else {
+      await atomicWrite(ocxPath, DEFAULT_OCX_CONFIG);
+      created.push("profileOcx");
+    }
+    const opencodePath = getProfileOpencodeConfig("default");
+    if (existsSync8(opencodePath)) {
+      existed.push("profileOpencode");
+    } else {
+      await atomicWrite(opencodePath, {});
+      created.push("profileOpencode");
+    }
+    const agentsPath = getProfileAgents("default");
+    if (existsSync8(agentsPath)) {
+      existed.push("profileAgents");
+    } else {
+      const agentsContent = `# Profile Instructions
+
+<!-- Add your custom instructions for this profile here -->
+<!-- These will be included when running \`ocx opencode -p default\` -->
+`;
+      await Bun.write(agentsPath, agentsContent, { mode: 384 });
+      created.push("profileAgents");
+    }
     spin?.succeed("Initialized global profiles");
     if (options2.json) {
       console.log(JSON.stringify({
         success: true,
-        profilesDir,
-        defaultProfile: "default",
-        ocxConfigPath
+        files: {
+          globalConfig: globalConfigPath,
+          profileOcx: ocxPath,
+          profileOpencode: opencodePath,
+          profileAgents: agentsPath
+        },
+        created,
+        existed
       }));
     } else if (!options2.quiet) {
-      logger.info(`Created ${profilesDir}`);
-      logger.info(`Created profile "default"`);
-      logger.info("");
-      logger.info("Next steps:");
-      logger.info("  1. Edit your profile config: ocx profile config");
-      logger.info("  2. Add registries: ocx registry add <url> --profile default");
-      logger.info("  3. Launch OpenCode: ocx opencode");
-      logger.info("  4. Create more profiles: ocx profile add <name>");
+      if (created.length > 0) {
+        for (const key of created) {
+          if (key === "globalConfig")
+            logger.info(`Created global config: ${globalConfigPath}`);
+          if (key === "profileOcx")
+            logger.info(`Created profile config: ${ocxPath}`);
+          if (key === "profileOpencode")
+            logger.info(`Created profile opencode config: ${opencodePath}`);
+          if (key === "profileAgents")
+            logger.info(`Created profile instructions: ${agentsPath}`);
+        }
+        logger.info("");
+        logger.info("Next steps:");
+        logger.info("  1. Edit your profile config: ocx config edit -p default");
+        logger.info("  2. Add registries: ocx registry add <url> --name <name> --global");
+        logger.info("  3. Launch OpenCode: ocx opencode");
+        logger.info("  4. Create more profiles: ocx profile add <name>");
+      } else {
+        logger.info("Global profiles already initialized (all files exist)");
+      }
     }
   } catch (error) {
     spin?.fail("Failed to initialize");
@@ -15346,7 +15494,7 @@ async function runInitRegistry(directory, options2) {
       await mkdir7(cwd, { recursive: true });
       await copyDir(options2.local, cwd);
     } else {
-      const version = options2.canary ? "main" : await getLatestVersion();
+      const version = options2.canary ? "main" : getReleaseTag();
       await fetchAndExtractTemplate(cwd, version, options2.verbose);
     }
     if (spin)
@@ -15375,15 +15523,16 @@ async function runInitRegistry(directory, options2) {
 async function copyDir(src, dest) {
   await cp(src, dest, { recursive: true });
 }
-async function getLatestVersion() {
-  const pkgPath = new URL("../../package.json", import.meta.url);
-  const pkgContent = await readFile(pkgPath);
-  const pkg = JSON.parse(pkgContent.toString());
-  return `v${pkg.version}`;
+function getReleaseTag() {
+  if (false) {}
+  return `v${"1.4.2"}`;
 }
-async function fetchAndExtractTemplate(destDir, version, verbose) {
+function getTemplateUrl(version) {
   const ref = version === "main" ? "heads/main" : `tags/${version}`;
-  const tarballUrl = `https://github.com/${TEMPLATE_REPO}/archive/refs/${ref}.tar.gz`;
+  return `https://github.com/${TEMPLATE_REPO}/archive/refs/${ref}.tar.gz`;
+}
+async function fetchAndExtractTemplate(destDir, version, verbose) {
+  const tarballUrl = getTemplateUrl(version);
   if (verbose) {
     logger.info(`Fetching ${tarballUrl}`);
   }
@@ -15492,6 +15641,18 @@ function formatTerminalName(cwd, profileName, gitInfo) {
 }
 
 // src/commands/opencode.ts
+function resolveOpenCodeBinary(opts) {
+  return opts.configBin ?? opts.envBin ?? "opencode";
+}
+function buildOpenCodeEnv(opts) {
+  return {
+    ...opts.baseEnv,
+    ...opts.disableProjectConfig && { OPENCODE_DISABLE_PROJECT_CONFIG: "true" },
+    ...opts.profileDir && { OPENCODE_CONFIG_DIR: opts.profileDir },
+    ...opts.mergedConfig && { OPENCODE_CONFIG_CONTENT: JSON.stringify(opts.mergedConfig) },
+    ...opts.profileName && { OCX_PROFILE: opts.profileName }
+  };
+}
 function registerOpencodeCommand(program2) {
   program2.command("opencode [path]").alias("oc").description("Launch OpenCode with resolved configuration").option("-p, --profile <name>", "Use specific profile").option("--no-rename", "Disable terminal/tmux window renaming").addOption(sharedOptions.quiet()).addOption(sharedOptions.json()).allowUnknownOption().allowExcessArguments(true).action(async (path8, options2, command) => {
     try {
@@ -15546,17 +15707,20 @@ async function runOpencode(pathArg, args, options2) {
     const gitInfo = await getGitInfo(projectDir);
     setTerminalName(formatTerminalName(projectDir, config.profileName ?? "default", gitInfo));
   }
-  const bin = ocxConfig?.bin ?? process.env.OPENCODE_BIN ?? "opencode";
+  const bin = resolveOpenCodeBinary({
+    configBin: ocxConfig?.bin,
+    envBin: process.env.OPENCODE_BIN
+  });
   proc = Bun.spawn({
     cmd: [bin, ...args],
     cwd: projectDir,
-    env: {
-      ...process.env,
-      OPENCODE_DISABLE_PROJECT_CONFIG: "true",
-      ...profileDir && { OPENCODE_CONFIG_DIR: profileDir },
-      ...configToPass && { OPENCODE_CONFIG_CONTENT: JSON.stringify(configToPass) },
-      ...config.profileName && { OCX_PROFILE: config.profileName }
-    },
+    env: buildOpenCodeEnv({
+      baseEnv: process.env,
+      profileDir,
+      profileName: config.profileName ?? undefined,
+      mergedConfig: configToPass,
+      disableProjectConfig: true
+    }),
     stdin: "inherit",
     stdout: "inherit",
     stderr: "inherit"
@@ -15846,14 +16010,14 @@ async function requireGlobalRegistry(namespace) {
     throw new ConfigError(`Registry "${namespace}" is not configured globally.
 
 ` + `Profile installation requires global registry configuration.
-` + `Run: ocx registry add ${namespace} <url> --global`);
+` + `Run: ocx registry add <url> --name ${namespace} --global`);
   }
   const registry = globalConfig.registries[namespace];
   if (!registry) {
     throw new ConfigError(`Registry "${namespace}" is not configured globally.
 
 ` + `Profile installation requires global registry configuration.
-` + `Run: ocx registry add ${namespace} <url> --global`);
+` + `Run: ocx registry add <url> --name ${namespace} --global`);
   }
   return { config: globalConfig, registryUrl: registry.url };
 }
@@ -15931,33 +16095,6 @@ async function cloneFromLocalProfile(manager, name, sourceName, exists) {
   logger.success(`Created profile "${name}" (cloned from "${sourceName}")`);
 }
 
-// src/commands/profile/config.ts
-function registerProfileConfigCommand(parent) {
-  parent.command("config [name]").description("Open profile ocx.jsonc in editor").action(async (name) => {
-    try {
-      await runProfileConfig(name);
-    } catch (error) {
-      handleError(error);
-    }
-  });
-}
-async function runProfileConfig(name) {
-  const manager = await ProfileManager.requireInitialized();
-  const profileName = name ?? await manager.resolveProfile();
-  await manager.get(profileName);
-  const configPath = getProfileOcxConfig(profileName);
-  const editor = process.env.EDITOR || process.env.VISUAL || "vi";
-  const proc = Bun.spawn([editor, configPath], {
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit"
-  });
-  const exitCode = await proc.exited;
-  if (exitCode !== 0) {
-    throw new Error(`Editor exited with code ${exitCode}`);
-  }
-}
-
 // src/commands/profile/list.ts
 function registerProfileListCommand(parent) {
   parent.command("list").alias("ls").description("List all global profiles").addOption(sharedOptions.json()).action(async (options2) => {
@@ -16044,22 +16181,43 @@ function registerProfileCommand(program2) {
   registerProfileAddCommand(profile);
   registerProfileRemoveCommand(profile);
   registerProfileShowCommand(profile);
-  registerProfileConfigCommand(profile);
 }
 
 // src/commands/registry.ts
+import { existsSync as existsSync10 } from "fs";
+import { dirname as dirname5, join as join9 } from "path";
 async function runRegistryAddCore2(url, options2, callbacks) {
   if (callbacks.isLocked?.()) {
     throw new Error("Registries are locked. Cannot add.");
   }
-  const name = options2.name || new URL(url).hostname.replace(/\./g, "-");
+  const trimmedUrl = url.trim();
+  if (!trimmedUrl) {
+    throw new ValidationError("Registry URL is required");
+  }
+  let derivedName;
+  try {
+    const parsed = new URL(trimmedUrl);
+    if (!["http:", "https:"].includes(parsed.protocol)) {
+      throw new ValidationError(`Invalid registry URL: ${trimmedUrl} (must use http or https)`);
+    }
+    derivedName = options2.name || parsed.hostname.replace(/\./g, "-");
+  } catch (error) {
+    if (error instanceof ValidationError)
+      throw error;
+    throw new ValidationError(`Invalid registry URL: ${trimmedUrl}`);
+  }
+  const name = derivedName;
   const registries = callbacks.getRegistries();
+  const existingRegistry = registries[name];
+  if (existingRegistry && !options2.force) {
+    throw new RegistryExistsError(name, existingRegistry.url, trimmedUrl);
+  }
   const isUpdate = name in registries;
   await callbacks.setRegistry(name, {
-    url,
+    url: trimmedUrl,
     version: options2.version
   });
-  return { name, url, updated: isUpdate };
+  return { name, url: trimmedUrl, updated: isUpdate };
 }
 async function runRegistryRemoveCore(name, callbacks) {
   if (callbacks.isLocked?.()) {
@@ -16082,43 +16240,69 @@ function runRegistryListCore(callbacks) {
   }));
   return { registries: list, locked };
 }
+async function resolveRegistryTarget(options2, command, cwd) {
+  const cwdExplicitlyProvided = command.getOptionValueSource("cwd") === "cli";
+  if (options2.global && options2.profile) {
+    throw new ValidationError("Cannot use both --global and --profile flags");
+  }
+  if (cwdExplicitlyProvided && options2.profile) {
+    throw new ValidationError("Cannot use both --cwd and --profile flags");
+  }
+  if (options2.global && cwdExplicitlyProvided) {
+    throw new ValidationError("Cannot use both --global and --cwd flags");
+  }
+  if (options2.profile) {
+    validateProfileName(options2.profile);
+    const manager = await ProfileManager.requireInitialized();
+    if (!await manager.exists(options2.profile)) {
+      throw new ProfileNotFoundError(options2.profile);
+    }
+    const configPath = getProfileOcxConfig(options2.profile);
+    if (!existsSync10(configPath)) {
+      throw new OcxConfigError(`Profile '${options2.profile}' has no ocx.jsonc. Run 'ocx profile config ${options2.profile}' to create it.`);
+    }
+    return {
+      scope: "profile",
+      configPath,
+      configDir: dirname5(configPath),
+      targetLabel: `profile '${options2.profile}' config`
+    };
+  }
+  if (options2.global) {
+    const configDir = getGlobalConfigPath();
+    return {
+      scope: "global",
+      configPath: join9(configDir, "ocx.jsonc"),
+      configDir,
+      targetLabel: "global config"
+    };
+  }
+  const found = findOcxConfig(cwd);
+  return {
+    scope: "local",
+    configPath: found.path,
+    configDir: found.exists ? dirname5(found.path) : join9(cwd, ".opencode"),
+    targetLabel: "local config"
+  };
+}
 function registerRegistryCommand(program2) {
   const registry = program2.command("registry").description("Manage registries");
-  const addCmd = registry.command("add").description("Add a registry").argument("<url>", "Registry URL").option("--name <name>", "Registry alias (defaults to hostname)").option("--version <version>", "Pin to specific version");
+  const addCmd = registry.command("add").description("Add a registry").argument("<url>", "Registry URL").option("--name <name>", "Registry alias (defaults to hostname)").option("--version <version>", "Pin to specific version").option("-f, --force", "Overwrite existing registry");
   addGlobalOption(addCmd);
+  addProfileOption(addCmd);
   addCommonOptions(addCmd);
   addCmd.action(async (url, options2, command) => {
+    let target;
     try {
-      const cwdExplicitlyProvided = command.getOptionValueSource("cwd") === "cli";
-      if (options2.global && cwdExplicitlyProvided) {
-        logger.error("Cannot use --global with --cwd. They are mutually exclusive.");
+      const cwd = options2.cwd ?? process.cwd();
+      target = await resolveRegistryTarget(options2, command, cwd);
+      const { configDir, configPath } = target;
+      const config = await readOcxConfig(configDir);
+      if (!config) {
+        const initHint = target.scope === "global" ? "Run 'ocx init --global' first." : target.scope === "profile" ? `Run 'ocx profile config ${options2.profile}' to create it.` : "Run 'ocx init' first.";
+        logger.error(`${target.targetLabel} not found. ${initHint}`);
         process.exit(1);
       }
-      let configDir;
-      let configPath;
-      const config = await (async () => {
-        if (options2.global) {
-          configDir = getGlobalConfigPath();
-          const found = findOcxConfig(configDir);
-          configPath = found.path;
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.error("Global config not found. Run 'opencode' once to initialize.");
-            process.exit(1);
-          }
-          return cfg;
-        } else {
-          configDir = options2.cwd ?? process.cwd();
-          const found = findOcxConfig(configDir);
-          configPath = found.path;
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.error("No ocx.jsonc found. Run 'ocx init' first.");
-            process.exit(1);
-          }
-          return cfg;
-        }
-      })();
       const result = await runRegistryAddCore2(url, options2, {
         getRegistries: () => config.registries,
         isLocked: () => config.lockRegistries ?? false,
@@ -16130,65 +16314,46 @@ function registerRegistryCommand(program2) {
       if (options2.json) {
         outputJson({ success: true, data: result });
       } else if (!options2.quiet) {
-        const location = options2.global ? "global config" : "local config";
         if (result.updated) {
-          logger.success(`Updated registry in ${location}: ${result.name} -> ${result.url}`);
+          logger.success(`Updated registry in ${target.targetLabel}: ${result.name} -> ${result.url}`);
         } else {
-          logger.success(`Added registry to ${location}: ${result.name} -> ${result.url}`);
+          logger.success(`Added registry to ${target.targetLabel}: ${result.name} -> ${result.url}`);
         }
       }
     } catch (error) {
+      if (error instanceof RegistryExistsError && !error.targetLabel) {
+        const enrichedError = new RegistryExistsError(error.registryName, error.existingUrl, error.newUrl, target?.targetLabel ?? "config");
+        handleError(enrichedError, { json: options2.json });
+      }
       handleError(error, { json: options2.json });
     }
   });
   const removeCmd = registry.command("remove").description("Remove a registry").argument("<name>", "Registry name");
   addGlobalOption(removeCmd);
+  addProfileOption(removeCmd);
   addCommonOptions(removeCmd);
   removeCmd.action(async (name, options2, command) => {
     try {
-      const cwdExplicitlyProvided = command.getOptionValueSource("cwd") === "cli";
-      if (options2.global && cwdExplicitlyProvided) {
-        logger.error("Cannot use --global with --cwd. They are mutually exclusive.");
+      const cwd = options2.cwd ?? process.cwd();
+      const target = await resolveRegistryTarget(options2, command, cwd);
+      const config = await readOcxConfig(target.configDir);
+      if (!config) {
+        const initHint = target.scope === "global" ? "Run 'ocx init --global' first." : target.scope === "profile" ? `Run 'ocx profile config ${options2.profile}' to create it.` : "Run 'ocx init' first.";
+        logger.error(`${target.targetLabel} not found. ${initHint}`);
         process.exit(1);
       }
-      let configDir;
-      let configPath;
-      const config = await (async () => {
-        if (options2.global) {
-          configDir = getGlobalConfigPath();
-          const found = findOcxConfig(configDir);
-          configPath = found.path;
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.error("Global config not found. Run 'opencode' once to initialize.");
-            process.exit(1);
-          }
-          return cfg;
-        } else {
-          configDir = options2.cwd ?? process.cwd();
-          const found = findOcxConfig(configDir);
-          configPath = found.path;
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.error("No ocx.jsonc found. Run 'ocx init' first.");
-            process.exit(1);
-          }
-          return cfg;
-        }
-      })();
       const result = await runRegistryRemoveCore(name, {
         getRegistries: () => config.registries,
         isLocked: () => config.lockRegistries ?? false,
         removeRegistry: async (regName) => {
           delete config.registries[regName];
-          await writeOcxConfig(configDir, config, configPath);
+          await writeOcxConfig(target.configDir, config, target.configPath);
         }
       });
       if (options2.json) {
         outputJson({ success: true, data: result });
       } else if (!options2.quiet) {
-        const location = options2.global ? "global config" : "local config";
-        logger.success(`Removed registry from ${location}: ${result.removed}`);
+        logger.success(`Removed registry from ${target.targetLabel}: ${result.removed}`);
       }
     } catch (error) {
       handleError(error, { json: options2.json });
@@ -16196,36 +16361,18 @@ function registerRegistryCommand(program2) {
   });
   const listCmd = registry.command("list").description("List configured registries");
   addGlobalOption(listCmd);
+  addProfileOption(listCmd);
   addCommonOptions(listCmd);
   listCmd.action(async (options2, command) => {
     try {
-      const cwdExplicitlyProvided = command.getOptionValueSource("cwd") === "cli";
-      if (options2.global && cwdExplicitlyProvided) {
-        logger.error("Cannot use --global with --cwd. They are mutually exclusive.");
-        process.exit(1);
-      }
-      let configDir;
-      const config = await (async () => {
-        if (options2.global) {
-          configDir = getGlobalConfigPath();
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.warn("Global config not found. Run 'opencode' once to initialize.");
-            return null;
-          }
-          return cfg;
-        } else {
-          configDir = options2.cwd ?? process.cwd();
-          const cfg = await readOcxConfig(configDir);
-          if (!cfg) {
-            logger.warn("No ocx.jsonc found. Run 'ocx init' first.");
-            return null;
-          }
-          return cfg;
-        }
-      })();
-      if (!config)
+      const cwd = options2.cwd ?? process.cwd();
+      const target = await resolveRegistryTarget(options2, command, cwd);
+      const config = await readOcxConfig(target.configDir);
+      if (!config) {
+        const initHint = target.scope === "global" ? "Run 'ocx init --global' first." : target.scope === "profile" ? `Run 'ocx profile config ${options2.profile}' to create it.` : "Run 'ocx init' first.";
+        logger.warn(`${target.targetLabel} not found. ${initHint}`);
         return;
+      }
       const result = runRegistryListCore({
         getRegistries: () => config.registries,
         isLocked: () => config.lockRegistries ?? false
@@ -16236,7 +16383,8 @@ function registerRegistryCommand(program2) {
         if (result.registries.length === 0) {
           logger.info("No registries configured.");
         } else {
-          logger.info(`Configured registries${options2.global ? " (global)" : ""}${result.locked ? kleur_default.yellow(" (locked)") : ""}:`);
+          const scopeLabel = target.scope === "global" ? " (global)" : target.scope === "profile" ? ` (profile '${options2.profile}')` : "";
+          logger.info(`Configured registries${scopeLabel}${result.locked ? kleur_default.yellow(" (locked)") : ""}:`);
           for (const reg of result.registries) {
             console.log(`  ${kleur_default.cyan(reg.name)}: ${reg.url} ${kleur_default.dim(`(${reg.version})`)}`);
           }
@@ -16371,7 +16519,7 @@ async function runSearchCore(query, options2, provider) {
 
 // src/self-update/version-provider.ts
 class BuildTimeVersionProvider {
-  version = "1.4.1";
+  version = "1.4.2";
 }
 var defaultVersionProvider = new BuildTimeVersionProvider;
 
@@ -16484,7 +16632,7 @@ function getExecutablePath() {
 }
 
 // src/self-update/download.ts
-import { chmodSync, existsSync as existsSync10, renameSync as renameSync2, unlinkSync as unlinkSync2 } from "fs";
+import { chmodSync, existsSync as existsSync11, renameSync as renameSync2, unlinkSync as unlinkSync2 } from "fs";
 var GITHUB_REPO2 = "kdcokenny/ocx";
 var DEFAULT_DOWNLOAD_BASE_URL = `https://github.com/${GITHUB_REPO2}/releases/download`;
 var PLATFORM_MAP = {
@@ -16562,7 +16710,7 @@ async function downloadToTemp(version) {
   try {
     chmodSync(tempPath, 493);
   } catch (error) {
-    if (existsSync10(tempPath)) {
+    if (existsSync11(tempPath)) {
       unlinkSync2(tempPath);
     }
     throw new SelfUpdateError(`Failed to set permissions: ${error instanceof Error ? error.message : String(error)}`);
@@ -16572,20 +16720,20 @@ async function downloadToTemp(version) {
 function atomicReplace(tempPath, execPath) {
   const backupPath = `${execPath}.backup`;
   try {
-    if (existsSync10(execPath)) {
+    if (existsSync11(execPath)) {
       renameSync2(execPath, backupPath);
     }
     renameSync2(tempPath, execPath);
-    if (existsSync10(backupPath)) {
+    if (existsSync11(backupPath)) {
       unlinkSync2(backupPath);
     }
   } catch (error) {
-    if (existsSync10(backupPath) && !existsSync10(execPath)) {
+    if (existsSync11(backupPath) && !existsSync11(execPath)) {
       try {
         renameSync2(backupPath, execPath);
       } catch {}
     }
-    if (existsSync10(tempPath)) {
+    if (existsSync11(tempPath)) {
       try {
         unlinkSync2(tempPath);
       } catch {}
@@ -16594,7 +16742,7 @@ function atomicReplace(tempPath, execPath) {
   }
 }
 function cleanupTempFile(tempPath) {
-  if (existsSync10(tempPath)) {
+  if (existsSync11(tempPath)) {
     try {
       unlinkSync2(tempPath);
     } catch {}
@@ -16770,9 +16918,9 @@ function registerSelfCommand(program2) {
 
 // src/commands/update.ts
 import { createHash as createHash4 } from "crypto";
-import { existsSync as existsSync11 } from "fs";
+import { existsSync as existsSync12 } from "fs";
 import { mkdir as mkdir9, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname5, join as join9 } from "path";
+import { dirname as dirname6, join as join10 } from "path";
 function registerUpdateCommand(program2) {
   program2.command("update [components...]").description("Update installed components (use @version suffix to pin, e.g., kdco/agents@1.2.0)").option("--all", "Update all installed components").option("--registry <name>", "Update all components from a specific registry").option("--dry-run", "Preview changes without applying").option("--cwd <path>", "Working directory", process.cwd()).option("-q, --quiet", "Suppress output").option("-v, --verbose", "Verbose output").option("--json", "Output as JSON").action(async (components, options2) => {
     try {
@@ -16910,9 +17058,9 @@ Version cannot be empty. Use 'kdco/agents@1.2.0' or omit the version for latest.
         const fileObj = update.component.files.find((f) => f.path === file.path);
         if (!fileObj)
           continue;
-        const targetPath = join9(provider.cwd, fileObj.target);
-        const targetDir = dirname5(targetPath);
-        if (!existsSync11(targetDir)) {
+        const targetPath = join10(provider.cwd, fileObj.target);
+        const targetDir = dirname6(targetPath);
+        if (!existsSync12(targetDir)) {
           await mkdir9(targetDir, { recursive: true });
         }
         await writeFile4(targetPath, file.content);
@@ -17076,7 +17224,7 @@ function registerUpdateCheckHook(program2) {
   });
 }
 // src/index.ts
-var version = "1.4.1";
+var version = "1.4.2";
 async function main2() {
   const program2 = new Command().name("ocx").description("OpenCode Extensions - Install agents, skills, plugins, and commands").version(version);
   registerInitCommand(program2);
@@ -17108,4 +17256,4 @@ export {
   buildRegistry
 };
 
-//# debugId=4E10E39074E11B3A64756E2164756E21
+//# debugId=52AD8D268EBA9E8864756E2164756E21