ocx 2.0.1 → 2.0.2

package/dist/index.js

@@ -6098,7 +6098,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "ocx",
-    version: "2.0.1",
+    version: "2.0.2",
     description: "OCX CLI - ShadCN-style registry for OpenCode extensions. Install agents, plugins, skills, and MCP servers.",
     author: "kdcokenny",
     license: "MIT",
@@ -16771,7 +16771,7 @@ async function copyDir(src, dest) {
 }
 function getReleaseTag() {
   if (false) {}
-  return `v${"2.0.1"}`;
+  return `v${"2.0.2"}`;
 }
 function getTemplateUrl(version) {
   const ref = version === "main" ? "heads/main" : `tags/${version}`;
@@ -17494,6 +17494,9 @@ async function applyConfigNormalizationToFile(root, actions) {
   await writeFile3(configInfo.path, content2);
 }
 
+// src/commands/opencode.ts
+import * as path8 from "path";
+
 // src/utils/terminal-title.ts
 import path7 from "path";
 var MAX_BRANCH_LENGTH = 20;
@@ -18166,17 +18169,62 @@ function dedupeLastWins(items) {
 function resolveOpenCodeBinary(opts) {
   return opts.configBin ?? opts.envBin ?? "opencode";
 }
+function isPathLikeLauncherToken(token) {
+  return token.includes("/") || token.includes("\\");
+}
+function resolveStableOpenCodeLauncherPath(opts) {
+  const { configuredBin, cwd } = opts;
+  const resolveExecutable = opts.resolveExecutable ?? ((command) => Bun.which(command));
+  if (!configuredBin.trim()) {
+    throw new Error("OpenCode launcher is empty and cannot be resolved to a stable path");
+  }
+  if (isPathLikeLauncherToken(configuredBin)) {
+    return path8.isAbsolute(configuredBin) ? configuredBin : path8.resolve(cwd, configuredBin);
+  }
+  const resolvedFromPath = resolveExecutable(configuredBin);
+  if (!resolvedFromPath) {
+    throw new Error(`OpenCode launcher "${configuredBin}" is not available in PATH and cannot be used as OPENCODE_BIN`);
+  }
+  return path8.isAbsolute(resolvedFromPath) ? resolvedFromPath : path8.resolve(cwd, resolvedFromPath);
+}
+function resolveStableOcxExecutablePath(opts) {
+  const resolveExecutable = opts.resolveExecutable ?? ((command) => Bun.which(command));
+  const argv = opts.argv ?? process.argv;
+  const execPath = opts.execPath ?? process.execPath;
+  const isCompiledBinary = opts.isCompiledBinary ?? (typeof Bun !== "undefined" && typeof Bun.main === "string" && Bun.main.startsWith("/$bunfs/"));
+  const inheritedOcxBin = opts.inheritedOcxBin?.trim();
+  const runtimeExecutable = isCompiledBinary ? execPath : argv[1];
+  const candidate = inheritedOcxBin && inheritedOcxBin.length > 0 ? inheritedOcxBin : runtimeExecutable;
+  if (!candidate?.trim()) {
+    throw new Error("OCX executable path is empty and cannot be resolved from the current process");
+  }
+  if (isPathLikeLauncherToken(candidate)) {
+    return path8.isAbsolute(candidate) ? candidate : path8.resolve(opts.cwd, candidate);
+  }
+  const resolvedFromPath = resolveExecutable(candidate);
+  if (!resolvedFromPath) {
+    throw new Error(`OCX executable "${candidate}" is not available in PATH and cannot be persisted as OCX_BIN`);
+  }
+  return path8.isAbsolute(resolvedFromPath) ? resolvedFromPath : path8.resolve(opts.cwd, resolvedFromPath);
+}
 function buildOpenCodeEnv(opts) {
   const hasProfile = Boolean(opts.profileName);
   const {
     OPENCODE_DISABLE_PROJECT_CONFIG: _inheritedDisableProjectConfig,
+    OPENCODE_BIN: _inheritedOpencodeBin,
+    OCX_CONTEXT: _inheritedOcxContext,
+    OCX_BIN: _inheritedOcxBin,
+    OCX_PROFILE: _inheritedOcxProfile,
     ...baseEnvWithoutDisableProjectConfig
   } = opts.baseEnv;
   return {
     ...baseEnvWithoutDisableProjectConfig,
+    ...opts.opencodeBin !== undefined && { OPENCODE_BIN: opts.opencodeBin },
     ...hasProfile && { OPENCODE_DISABLE_PROJECT_CONFIG: "true" },
     OPENCODE_CONFIG_DIR: opts.configDir ?? (hasProfile ? getProfileDir(opts.profileName) : getGlobalConfigPath()),
     ...opts.configContent && { OPENCODE_CONFIG_CONTENT: opts.configContent },
+    ...hasProfile && { OCX_CONTEXT: "1" },
+    ...hasProfile && opts.ocxBin && { OCX_BIN: opts.ocxBin },
     ...opts.profileName && { OCX_PROFILE: opts.profileName }
   };
 }
@@ -18269,18 +18317,29 @@ async function runOpencode(args, options2) {
       childExitCode = preSpawnSignalExitCode;
       return;
     }
-    const bin = resolveOpenCodeBinary({
+    const configuredBin = resolveOpenCodeBinary({
       configBin: ocxConfig?.bin,
       envBin: process.env.OPENCODE_BIN
     });
+    const hasProfileLaunchContext = Boolean(config.profileName);
+    const resolvedOpenCodeLaunchBin = hasProfileLaunchContext ? resolveStableOpenCodeLauncherPath({
+      configuredBin,
+      cwd: projectDir
+    }) : configuredBin;
+    const resolvedOcxBin = hasProfileLaunchContext ? resolveStableOcxExecutablePath({
+      cwd: projectDir,
+      inheritedOcxBin: process.env.OCX_BIN
+    }) : undefined;
     const configContent = configToPass ? JSON.stringify(configToPass) : undefined;
     try {
       proc = Bun.spawn({
-        cmd: [bin, ...args],
+        cmd: [resolvedOpenCodeLaunchBin, ...args],
         cwd: projectDir,
         env: buildOpenCodeEnv({
           baseEnv: process.env,
           profileName: config.profileName ?? undefined,
+          ocxBin: resolvedOcxBin,
+          opencodeBin: resolvedOpenCodeLaunchBin,
           configDir: mergedConfig?.path,
           configContent
         }),
@@ -18289,7 +18348,7 @@ async function runOpencode(args, options2) {
         stderr: "inherit"
       });
     } catch (error) {
-      throw createOpencodeOcError("spawn", `Failed to launch OpenCode binary "${bin}": ${error instanceof Error ? error.message : String(error)}`);
+      throw createOpencodeOcError("spawn", `Failed to launch OpenCode binary "${configuredBin}": ${error instanceof Error ? error.message : String(error)}`);
     }
     childExitCode = await proc.exited;
   } catch (error) {
@@ -19749,7 +19808,7 @@ async function runSearchCore(query, options2, provider) {
 // src/commands/self/uninstall.ts
 import { existsSync as existsSync16, lstatSync as lstatSync2, readdirSync as readdirSync2, realpathSync as realpathSync2, rmSync, unlinkSync } from "fs";
 import { homedir as homedir5 } from "os";
-import path8 from "path";
+import path9 from "path";
 
 // src/self-update/detect-method.ts
 init_errors2();
@@ -19763,11 +19822,11 @@ Valid methods: ${VALID_METHODS.join(", ")}`);
   return method;
 }
 var isCompiledBinary = () => Bun.main.startsWith("/$bunfs/");
-var isTempExecution = (path8) => path8.includes("/_npx/") || path8.includes("/.cache/bunx/") || path8.includes("/.pnpm/_temp/");
-var isYarnGlobalInstall = (path8) => path8.includes("/.yarn/global") || path8.includes("/.config/yarn/global");
-var isPnpmGlobalInstall = (path8) => path8.includes("/.pnpm/") || path8.includes("/pnpm/global");
-var isBunGlobalInstall = (path8) => path8.includes("/.bun/bin") || path8.includes("/.bun/install/global");
-var isNpmGlobalInstall = (path8) => path8.includes("/.npm/") || path8.includes("/node_modules/");
+var isTempExecution = (path9) => path9.includes("/_npx/") || path9.includes("/.cache/bunx/") || path9.includes("/.pnpm/_temp/");
+var isYarnGlobalInstall = (path9) => path9.includes("/.yarn/global") || path9.includes("/.config/yarn/global");
+var isPnpmGlobalInstall = (path9) => path9.includes("/.pnpm/") || path9.includes("/pnpm/global");
+var isBunGlobalInstall = (path9) => path9.includes("/.bun/bin") || path9.includes("/.bun/install/global");
+var isNpmGlobalInstall = (path9) => path9.includes("/.npm/") || path9.includes("/node_modules/");
 function detectInstallMethod() {
   if (isCompiledBinary()) {
     return "curl";
@@ -19836,16 +19895,16 @@ function tildify(absolutePath) {
     return absolutePath;
   if (absolutePath === home)
     return "~";
-  if (absolutePath.startsWith(home + path8.sep)) {
+  if (absolutePath.startsWith(home + path9.sep)) {
     return `~${absolutePath.slice(home.length)}`;
   }
   return absolutePath;
 }
 function getRelativePathIfContained(parent, child) {
-  const normalizedParent = path8.normalize(parent);
-  const normalizedChild = path8.normalize(child);
-  const relative8 = path8.relative(normalizedParent, normalizedChild);
-  if (relative8.startsWith("..") || path8.isAbsolute(relative8)) {
+  const normalizedParent = path9.normalize(parent);
+  const normalizedChild = path9.normalize(child);
+  const relative8 = path9.relative(normalizedParent, normalizedChild);
+  if (relative8.startsWith("..") || path9.isAbsolute(relative8)) {
     return null;
   }
   return relative8;
@@ -19949,8 +20008,8 @@ function getPackageManagerCommand(method) {
   }
 }
 function getGlobalConfigRoot() {
-  const base = process.env.XDG_CONFIG_HOME || path8.join(homedir5(), ".config");
-  return path8.join(base, "opencode");
+  const base = process.env.XDG_CONFIG_HOME || path9.join(homedir5(), ".config");
+  return path9.join(base, "opencode");
 }
 function buildConfigTargets() {
   const rootPath = getGlobalConfigRoot();
@@ -20003,10 +20062,10 @@ function buildBinaryTarget() {
   if (method === "curl") {
     const binaryPath = getExecutablePath();
     const kind = getPathKind(binaryPath);
-    const parentDir = path8.dirname(binaryPath);
+    const parentDir = path9.dirname(binaryPath);
     return {
       rootPath: parentDir,
-      relativePath: path8.basename(binaryPath),
+      relativePath: path9.basename(binaryPath),
       absolutePath: binaryPath,
       displayPath: tildify(binaryPath),
       kind,
@@ -20052,8 +20111,8 @@ function executeRemovals(targets) {
 }
 function removeBinary(binaryPath, options2 = {}) {
   const target = {
-    rootPath: path8.dirname(binaryPath),
-    relativePath: path8.basename(binaryPath),
+    rootPath: path9.dirname(binaryPath),
+    relativePath: path9.basename(binaryPath),
     absolutePath: binaryPath,
     displayPath: tildify(binaryPath),
     kind: getPathKind(binaryPath),
@@ -20348,7 +20407,7 @@ init_errors2();
 
 // src/self-update/version-provider.ts
 class BuildTimeVersionProvider {
-  version = "2.0.1";
+  version = "2.0.2";
 }
 var defaultVersionProvider = new BuildTimeVersionProvider;
 
@@ -21154,7 +21213,7 @@ function outputUpdateDryRun(results, options2) {
 }
 
 // src/commands/validate.ts
-import { resolve as resolve7 } from "path";
+import { resolve as resolve8 } from "path";
 init_errors2();
 function createLoadValidationError2(message, errorKind) {
   if (errorKind === "not_found") {
@@ -21190,9 +21249,9 @@ function outputValidationErrors(errors3) {
   }
 }
 function registerValidateCommand(program2) {
-  program2.command("validate").description("Validate a registry source (for registry authors)").argument("[path]", "Registry source directory", ".").option("--cwd <path>", "Working directory", process.cwd()).option("--json", "Output as JSON", false).option("-q, --quiet", "Suppress output", false).option("--no-duplicate-targets", "Skip duplicate target validation").action(async (path9, options2) => {
+  program2.command("validate").description("Validate a registry source (for registry authors)").argument("[path]", "Registry source directory", ".").option("--cwd <path>", "Working directory", process.cwd()).option("--json", "Output as JSON", false).option("-q, --quiet", "Suppress output", false).option("--no-duplicate-targets", "Skip duplicate target validation").action(async (path10, options2) => {
     try {
-      const sourcePath = resolve7(options2.cwd, path9);
+      const sourcePath = resolve8(options2.cwd, path10);
       const validationResult = await runCompleteValidation(sourcePath, {
         skipDuplicateTargets: options2.duplicateTargets === false
       });
@@ -21315,11 +21374,11 @@ async function runVerify(componentNames, options2) {
         }
       } else {
         logger.error(`\u2717 ${result.canonicalId} - integrity check failed`);
-        for (const path9 of result.modified) {
-          logger.error(`    Modified: ${path9}`);
+        for (const path10 of result.modified) {
+          logger.error(`    Modified: ${path10}`);
         }
-        for (const path9 of result.missing) {
-          logger.error(`    Missing:  ${path9}`);
+        for (const path10 of result.missing) {
+          logger.error(`    Missing:  ${path10}`);
         }
       }
     }
@@ -21369,7 +21428,7 @@ function registerUpdateCheckHook(program2) {
   });
 }
 // src/index.ts
-var version = "2.0.1";
+var version = "2.0.2";
 async function main2() {
   const program2 = new Command().name("ocx").description("OpenCode Extensions - Install agents, skills, plugins, and commands").version(version);
   registerInitCommand(program2);
@@ -21403,4 +21462,4 @@ export {
   buildRegistry
 };
 
-//# debugId=4F8B9C341AC7574B64756E2164756E21
+//# debugId=F324B1CA6BEB983B64756E2164756E21