ocx 1.4.3 → 1.4.4

package/dist/index.js

@@ -9924,8 +9924,9 @@ class ProfileNotFoundError extends OCXError {
 
 class ProfileExistsError extends OCXError {
   profile;
-  constructor(profile) {
-    super(`Profile "${profile}" already exists. Use --force to overwrite.`, "CONFLICT", EXIT_CODES.CONFLICT);
+  constructor(profile, hint) {
+    const message = hint ? `Profile "${profile}" already exists. ${hint}` : `Profile "${profile}" already exists.`;
+    super(message, "CONFLICT", EXIT_CODES.CONFLICT);
     this.profile = profile;
     this.name = "ProfileExistsError";
   }
@@ -10366,8 +10367,16 @@ var installedComponentSchema = exports_external.object({
   installedAt: exports_external.string(),
   updatedAt: exports_external.string().optional()
 });
+var installedFromSchema = exports_external.object({
+  registry: exports_external.string(),
+  component: exports_external.string(),
+  version: exports_external.string().optional(),
+  hash: exports_external.string(),
+  installedAt: exports_external.string()
+});
 var ocxLockSchema = exports_external.object({
   lockVersion: exports_external.literal(1),
+  installedFrom: installedFromSchema.optional(),
   installed: exports_external.record(qualifiedComponentSchema, installedComponentSchema).default({})
 });
 var CONFIG_FILE = "ocx.jsonc";
@@ -11116,7 +11125,7 @@ class ConfigResolver {
 // package.json
 var package_default = {
   name: "ocx",
-  version: "1.4.3",
+  version: "1.4.4",
   description: "OCX CLI - ShadCN-style registry for OpenCode extensions. Install agents, plugins, skills, and MCP servers.",
   author: "kdcokenny",
   license: "MIT",
@@ -15805,7 +15814,7 @@ async function copyDir(src, dest) {
 }
 function getReleaseTag() {
   if (false) {}
-  return `v${"1.4.3"}`;
+  return `v${"1.4.4"}`;
 }
 function getTemplateUrl(version) {
   const ref = version === "main" ? "heads/main" : `tags/${version}`;
@@ -16048,7 +16057,7 @@ function hashBundle2(files) {
 `));
 }
 async function installProfileFromRegistry(options2) {
-  const { namespace, component, profileName, force, registryUrl, registries, quiet } = options2;
+  const { namespace, component, profileName, registryUrl, registries, quiet } = options2;
   const parseResult = profileNameSchema.safeParse(profileName);
   if (!parseResult.success) {
     throw new ValidationError(`Invalid profile name: "${profileName}". ` + `Profile names must start with a letter and contain only alphanumeric characters, dots, underscores, or hyphens.`);
@@ -16056,9 +16065,8 @@ async function installProfileFromRegistry(options2) {
   const profileDir = getProfileDir(profileName);
   const qualifiedName = `${namespace}/${component}`;
   const profileExists = existsSync9(profileDir);
-  if (profileExists && !force) {
-    throw new ConflictError(`Profile "${profileName}" already exists.
-Use --force to overwrite.`);
+  if (profileExists) {
+    throw new ConflictError(`Profile "${profileName}" already exists. Remove it first with 'ocx profile rm ${profileName}'.`);
   }
   const fetchSpin = quiet ? null : createSpinner({ text: `Fetching ${qualifiedName}...` });
   fetchSpin?.start();
@@ -16100,46 +16108,10 @@ Use --force to overwrite.`);
     }
   }
   filesSpin?.succeed(`Downloaded ${normalized.files.length} files`);
-  let resolvedDeps = null;
-  const dependencyBundles = [];
-  if (manifest.dependencies.length > 0) {
-    const depsSpin = quiet ? null : createSpinner({ text: "Resolving dependencies..." });
-    depsSpin?.start();
-    try {
-      const depRefs = manifest.dependencies.map((dep) => dep.includes("/") ? dep : `${namespace}/${dep}`);
-      resolvedDeps = await resolveDependencies(registries, depRefs);
-      for (const depComponent of resolvedDeps.components) {
-        const files = [];
-        for (const file of depComponent.files) {
-          const content2 = await fetchFileContent(depComponent.baseUrl, depComponent.name, file.path);
-          const resolvedTarget = resolveTargetPath(file.target, true);
-          files.push({
-            path: file.path,
-            target: resolvedTarget,
-            content: Buffer.from(content2)
-          });
-        }
-        const registryIndex = await fetchRegistryIndex(depComponent.baseUrl);
-        dependencyBundles.push({
-          qualifiedName: depComponent.qualifiedName,
-          registryName: depComponent.registryName,
-          files,
-          hash: hashBundle2(files),
-          version: registryIndex.version
-        });
-      }
-      depsSpin?.succeed(`Resolved ${resolvedDeps.components.length} dependencies`);
-    } catch (error) {
-      depsSpin?.fail("Failed to resolve dependencies");
-      throw error;
-    }
-  }
   const profilesDir = getProfilesDir();
   await mkdir8(profilesDir, { recursive: true, mode: 448 });
   const stagingDir = await mkdtemp(join8(profilesDir, ".staging-"));
-  const stagingOpencodeDir = join8(stagingDir, ".opencode");
   try {
-    await mkdir8(stagingOpencodeDir, { recursive: true, mode: 448 });
     const writeSpin = quiet ? null : createSpinner({ text: "Writing profile files..." });
     writeSpin?.start();
     for (const file of profileFiles) {
@@ -16152,7 +16124,7 @@ Use --force to overwrite.`);
     }
     for (const file of embeddedFiles) {
       const target = file.target.startsWith(".opencode/") ? file.target.slice(".opencode/".length) : file.target;
-      const targetPath = join8(stagingOpencodeDir, target);
+      const targetPath = join8(stagingDir, target);
       const targetDir = dirname4(targetPath);
       if (!existsSync9(targetDir)) {
         await mkdir8(targetDir, { recursive: true });
@@ -16160,27 +16132,10 @@ Use --force to overwrite.`);
       await writeFile3(targetPath, file.content);
     }
     writeSpin?.succeed(`Wrote ${profileFiles.length + embeddedFiles.length} profile files`);
-    if (dependencyBundles.length > 0) {
-      const depWriteSpin = quiet ? null : createSpinner({ text: "Writing dependency files..." });
-      depWriteSpin?.start();
-      let depFileCount = 0;
-      for (const bundle of dependencyBundles) {
-        for (const file of bundle.files) {
-          const targetPath = join8(stagingOpencodeDir, file.target);
-          const targetDir = dirname4(targetPath);
-          if (!existsSync9(targetDir)) {
-            await mkdir8(targetDir, { recursive: true });
-          }
-          await writeFile3(targetPath, file.content);
-          depFileCount++;
-        }
-      }
-      depWriteSpin?.succeed(`Wrote ${depFileCount} dependency files`);
-    }
     const profileHash = hashBundle2(profileFiles.map((f) => ({ path: f.path, content: f.content })));
     const registryIndex = await fetchRegistryIndex(registryUrl);
     const lock = {
-      version: 1,
+      lockVersion: 1,
       installedFrom: {
         registry: namespace,
         component,
@@ -16190,36 +16145,32 @@ Use --force to overwrite.`);
       },
       installed: {}
     };
-    for (const bundle of dependencyBundles) {
-      lock.installed[bundle.qualifiedName] = {
-        registry: bundle.registryName,
-        version: bundle.version,
-        hash: bundle.hash,
-        files: bundle.files.map((f) => f.target),
-        installedAt: new Date().toISOString()
-      };
-    }
-    await writeFile3(join8(stagingDir, "ocx.lock"), JSON.stringify(lock, null, "\t"));
-    const moveSpin = quiet ? null : createSpinner({ text: "Finalizing installation..." });
-    moveSpin?.start();
+    await writeOcxLock(stagingDir, lock, join8(stagingDir, "ocx.lock"));
+    const renameSpin = quiet ? null : createSpinner({ text: "Moving to profile directory..." });
+    renameSpin?.start();
     const profilesDir2 = dirname4(profileDir);
     if (!existsSync9(profilesDir2)) {
       await mkdir8(profilesDir2, { recursive: true, mode: 448 });
     }
-    if (profileExists && force) {
-      const backupDir = `${profileDir}.backup-${Date.now()}`;
-      await rename3(profileDir, backupDir);
+    await rename3(stagingDir, profileDir);
+    renameSpin?.succeed("Profile installed");
+    if (manifest.dependencies.length > 0) {
+      const depsSpin = quiet ? null : createSpinner({ text: "Installing dependencies..." });
+      depsSpin?.start();
       try {
-        await rename3(stagingDir, profileDir);
-      } catch (err) {
-        await rename3(backupDir, profileDir);
-        throw err;
+        const depRefs = manifest.dependencies.map((dep) => dep.includes("/") ? dep : `${namespace}/${dep}`);
+        const provider = {
+          cwd: profileDir,
+          getRegistries: () => registries,
+          getComponentPath: () => ""
+        };
+        await runAddCore(depRefs, { profile: profileName }, provider);
+        depsSpin?.succeed(`Installed ${manifest.dependencies.length} dependencies`);
+      } catch (error) {
+        depsSpin?.fail("Failed to install dependencies");
+        throw error;
       }
-      await rm3(backupDir, { recursive: true, force: true });
-    } else {
-      await rename3(stagingDir, profileDir);
     }
-    moveSpin?.succeed("Installation complete");
     if (!quiet) {
       logger.info("");
       logger.success(`Installed profile "${profileName}" from ${qualifiedName}`);
@@ -16228,12 +16179,9 @@ Use --force to overwrite.`);
       for (const file of profileFiles) {
         logger.info(`  ${file.target}`);
       }
-      if (dependencyBundles.length > 0) {
-        logger.info("");
-        logger.info("Dependencies:");
-        for (const bundle of dependencyBundles) {
-          logger.info(`  ${bundle.qualifiedName}`);
-        }
+      for (const file of embeddedFiles) {
+        const target = file.target.startsWith(".opencode/") ? file.target.slice(".opencode/".length) : file.target;
+        logger.info(`  ${target}`);
       }
     }
   } catch (error) {
@@ -16252,9 +16200,6 @@ function parseFromOption(from) {
     throw new ValidationError("--from value cannot be empty");
   }
   const trimmed = from.trim();
-  if (trimmed.startsWith("./") || trimmed.startsWith("~/") || trimmed.startsWith("/")) {
-    return { type: "local-path", path: trimmed };
-  }
   const slashCount = (trimmed.match(/\//g) || []).length;
   if (slashCount === 1) {
     const [namespace, component] = trimmed.split("/").map((s) => s.trim());
@@ -16302,12 +16247,11 @@ async function requireGlobalRegistry(namespace) {
   return { config: globalConfig, registryUrl: registry.url };
 }
 function registerProfileAddCommand(parent) {
-  parent.command("add <name>").description("Create a new profile, clone from existing, or install from registry").option("--from <source>", "Clone from existing profile or install from registry (e.g., kdco/minimal)").option("-f, --force", "Overwrite existing profile").addHelpText("after", `
+  parent.command("add <name>").description("Create a new profile, clone from existing, or install from registry").option("--from <source>", "Clone from existing profile or install from registry (e.g., kdco/minimal)").addHelpText("after", `
 Examples:
   $ ocx profile add work                      # Create empty profile
   $ ocx profile add work --from dev           # Clone from existing profile
   $ ocx profile add work --from kdco/minimal  # Install from registry
-  $ ocx profile add work --from kdco/minimal --force  # Overwrite existing
 `).action(async (name, options2) => {
     try {
       await runProfileAdd(name, options2);
@@ -16318,28 +16262,15 @@ Examples:
 }
 async function runProfileAdd(name, options2) {
   const manager = await ProfileManager.requireInitialized();
-  const profileExists = await manager.exists(name);
-  if (profileExists && !options2.force) {
-    logger.error(`\u2717 Profile "${name}" already exists`);
-    logger.error("");
-    logger.error("Use --force to overwrite the existing profile.");
-    throw new ProfileExistsError(name);
-  }
   if (!options2.from) {
-    await createEmptyProfile(manager, name, profileExists);
+    await createEmptyProfile(manager, name);
     return;
   }
   const fromInput = parseFromOption(options2.from);
   switch (fromInput.type) {
     case "local-profile":
-      await cloneFromLocalProfile(manager, name, fromInput.name, profileExists);
+      await cloneFromLocalProfile(manager, name, fromInput.name);
       break;
-    case "local-path":
-      throw new ValidationError(`Local path installation is not yet implemented: "${fromInput.path}"
-
-` + `Currently supported sources:
-` + `  - Existing profile: --from <profile-name>
-` + `  - Registry: --from <namespace>/<component>`);
     case "registry": {
       const { config: globalConfig, registryUrl } = await requireGlobalRegistry(fromInput.namespace);
       const registries = {};
@@ -16350,7 +16281,6 @@ async function runProfileAdd(name, options2) {
         namespace: fromInput.namespace,
         component: fromInput.component,
         profileName: name,
-        force: options2.force,
         registryUrl,
         registries
       });
@@ -16358,18 +16288,20 @@ async function runProfileAdd(name, options2) {
     }
   }
 }
-async function createEmptyProfile(manager, name, exists) {
+async function createEmptyProfile(manager, name) {
+  const exists = await manager.exists(name);
   if (exists) {
-    await manager.remove(name);
+    throw new ProfileExistsError(name, `Remove it first with 'ocx profile rm ${name}'.`);
   }
   await manager.add(name);
   logger.success(`Created profile "${name}"`);
 }
-async function cloneFromLocalProfile(manager, name, sourceName, exists) {
-  const source = await manager.get(sourceName);
+async function cloneFromLocalProfile(manager, name, sourceName) {
+  const exists = await manager.exists(name);
   if (exists) {
-    await manager.remove(name);
+    throw new ProfileExistsError(name, `Remove it first with 'ocx profile rm ${name}'.`);
   }
+  const source = await manager.get(sourceName);
   await manager.add(name);
   await atomicWrite(getProfileOcxConfig(name), source.ocx);
   logger.success(`Created profile "${name}" (cloned from "${sourceName}")`);
@@ -17270,7 +17202,7 @@ function registerSelfUninstallCommand(parent) {
 
 // src/self-update/version-provider.ts
 class BuildTimeVersionProvider {
-  version = "1.4.3";
+  version = "1.4.4";
 }
 var defaultVersionProvider = new BuildTimeVersionProvider;
 
@@ -17927,7 +17859,7 @@ function registerUpdateCheckHook(program2) {
   });
 }
 // src/index.ts
-var version = "1.4.3";
+var version = "1.4.4";
 async function main2() {
   const program2 = new Command().name("ocx").description("OpenCode Extensions - Install agents, skills, plugins, and commands").version(version);
   registerInitCommand(program2);
@@ -17959,4 +17891,4 @@ export {
   buildRegistry
 };
 
-//# debugId=947205F975538A0764756E2164756E21
+//# debugId=C29AE4337E16008A64756E2164756E21