@callstack/apex 0.4.4 → 0.4.5

package/README.md

@@ -234,10 +234,12 @@ Other launchers: `apex run opencode`, `apex run claude`, `apex run pi`, `apex ru
 Launchers pass extra arguments through unchanged (without a shell), can be overridden by explicit
 user arguments, and never run `init`. `apex run claude` sets the gateway URL, token, attribution
 flag and model aliases in the child process only, leaving your default Claude provider alone.
-`apex run opencode` checks which OpenCode is installed: OpenCode 1 gets `--model`; OpenCode 2,
-whose terminal interface has no `--model`, starts with `--standalone` and the model in
-`OPENCODE_CONFIG_CONTENT`, so the private server sees the model and, for a config that references
-the key variable, your key too.
+`apex run opencode` asks the installed binary which interface it has (`--standalone` exists only on
+OpenCode 2; its version number says nothing, because dev and beta builds of both generations report
+`0.0.0-*`): OpenCode 1 gets `--model`; OpenCode 2, whose terminal interface has no `--model`, starts
+with `--standalone` and the model in `OPENCODE_CONFIG_CONTENT`, so the private server sees the
+model and, for a config that references the key variable, your key too. A binary that cannot be
+asked launches with neither flag, on your own configuration, and says so.
 
 ## Safety and recovery
 

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { isDeepStrictEqual, parseArgs, styleText } from "node:util";
+import { isDeepStrictEqual, parseArgs, promisify, styleText } from "node:util";
 import { execFile, spawn } from "node:child_process";
 import { access, lstat, mkdir, open, readFile, rename, stat, unlink } from "node:fs/promises";
 import { basename, delimiter, dirname, join, parse, resolve } from "node:path";
@@ -2602,14 +2602,15 @@ async function executable(command, env = process.env, platform = process.platfor
 	}
 	return null;
 }
-function openCodeMajor(binary) {
-	if (!binary) return Promise.resolve(1);
-	return new Promise((resolve) => {
-		execFile(binary, ["--version"], { timeout: 1e4 }, (error, stdout) => {
-			const match = !error && /^(?:opencode )?v?(\d+)\.\d+\.\d+\s*$/m.exec(stdout);
-			resolve(match ? Number(match[1]) : 1);
-		});
-	});
+const execFileAsync = promisify(execFile);
+async function openCodeSupportsStandalone(binary) {
+	if (!binary) return null;
+	try {
+		const { stdout, stderr } = await execFileAsync(binary, ["--help"], { timeout: 5e3 });
+		return `${stdout}${stderr}`.includes("--standalone");
+	} catch (error) {
+		return `${error.stdout}${error.stderr}`.includes("--standalone") ? true : null;
+	}
 }
 function locations(home = homedir(), env = process.env, platform = process.platform) {
 	const config = env.XDG_CONFIG_HOME || join(home, ".config");
@@ -2851,14 +2852,20 @@ function launchToken(env, provider) {
 	if (!token?.trim()) throw new Error(`Set ${provider.envVar} in your environment before launching with ${provider.name}.`);
 	return token;
 }
-function launchOptions(id, env = process.env, provider = defaultProvider(env), { openCode = 1 } = {}) {
+function launchOptions(id, env = process.env, provider = defaultProvider(env), { openCodeStandalone = false } = {}) {
 	const { model } = provider;
 	const token = launchToken(env, provider);
 	const childEnv = { ...env };
 	switch (id) {
 		case "opencode": {
 			const selected = `${provider.opencode}/${model}`;
-			if (openCode < 2) return {
+			if (openCodeStandalone === null) return {
+				args: [],
+				env: childEnv,
+				note: "(OpenCode interface unknown: no model flag added)",
+				warning: "Apex CLI: Could not ask which OpenCode interface is installed, so it launches without a model flag. OpenCode 1 takes --model, OpenCode 2 takes --standalone; opencode --help says which you have."
+			};
+			if (!openCodeStandalone) return {
 				args: ["--model", selected],
 				env: childEnv
 			};
@@ -2919,7 +2926,7 @@ function launchOptions(id, env = process.env, provider = defaultProvider(env), {
 }
 function runExpansion(id, provider, installed = {}) {
 	const { args, note } = launchOptions(id, { [provider.envVar]: "placeholder" }, provider, installed);
-	return [`${id} ${args.join(" ")}`, note].filter(Boolean).join("  ");
+	return [[id, ...args].join(" "), note].filter(Boolean).join("  ");
 }
 const copilotModel = (provider) => JSON.stringify({
 	id: provider.model,
@@ -4998,10 +5005,12 @@ async function commandInit(rest) {
 		dim("Apex CLI never reads, stores or logs the key itself.")
 	]);
 	const runnable = active.map((entry) => entry.id).filter((id) => RUNNABLE.includes(id));
-	const installed = { openCode: await openCodeMajor(active.find((entry) => entry.id === "opencode")?.binary) };
+	const opencodeBinary = active.find((entry) => entry.id === "opencode")?.binary;
+	const probed = opencodeBinary ? await openCodeSupportsStandalone(opencodeBinary) : void 0;
+	const installed = { openCodeStandalone: probed };
 	const rows = runnable.map((id) => ({
 		command: `${apex} run ${id}`,
-		expansion: runExpansion(id, provider, installed)
+		expansion: id === "opencode" && probed === void 0 ? id : runExpansion(id, provider, installed)
 	}));
 	const commandWidth = columnWidth(rows.map((row) => row.command));
 	section(runnable.length ? `Use these commands to run ${provider.model} with your selected harnesses:` : `Use ${provider.model} with your assistant:`, [
@@ -5195,7 +5204,9 @@ async function commandRun(rest) {
 	const binary = await executable(id);
 	if (!binary) throw new Error(`${id} was not found on PATH. Install it first, then run ${APEX} init.`);
 	if (process.platform === "win32" && /\.(cmd|bat)$/i.test(binary)) throw new Error("Windows .cmd/.bat launchers are not executed through a shell. Use WSL or launch the configured assistant directly.");
-	const options = launchOptions(id, process.env, provider, { openCode: await openCodeMajor(id === "opencode" && binary) });
+	const standalone = id === "opencode" ? await openCodeSupportsStandalone(binary) : false;
+	const options = launchOptions(id, process.env, provider, { openCodeStandalone: standalone });
+	if (options.warning) console.error(styleText("yellow", options.warning));
 	const args = passed[0] === "--" ? passed.slice(1) : passed;
 	const child = spawn(binary, await launchArgs(options, args), {
 		env: options.env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/apex",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Detects the AI coding assistants installed on your machine and configures them to use Callstack Apex.",
   "license": "MIT",
   "keywords": [