@callstack/apex 0.4.2 → 0.4.4

package/README.md

@@ -234,6 +234,10 @@ 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.
 
 ## Safety and recovery
 

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { isDeepStrictEqual, parseArgs, styleText } from "node:util";
-import { spawn } from "node:child_process";
+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";
 import { createHash, randomUUID } from "node:crypto";
@@ -2602,6 +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);
+		});
+	});
+}
 function locations(home = homedir(), env = process.env, platform = process.platform) {
 	const config = env.XDG_CONFIG_HOME || join(home, ".config");
 	const userData = platform === "darwin" ? join(home, "Library", "Application Support") : platform === "win32" ? env.APPDATA || join(home, "AppData", "Roaming") : config;
@@ -2837,16 +2846,34 @@ async function planAssistant(assistant, provider = PROVIDERS.vercel) {
 	}
 	return changes;
 }
-function launchOptions(id, env = process.env, provider = defaultProvider(env)) {
-	const { model, envVar } = provider;
-	const token = env[envVar];
-	if (!token?.trim()) throw new Error(`Set ${envVar} in your environment before launching with ${provider.name}.`);
+function launchToken(env, provider) {
+	const token = env[provider.envVar];
+	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 } = {}) {
+	const { model } = provider;
+	const token = launchToken(env, provider);
 	const childEnv = { ...env };
 	switch (id) {
-		case "opencode": return {
-			args: ["--model", `${provider.opencode}/${model}`],
-			env: childEnv
-		};
+		case "opencode": {
+			const selected = `${provider.opencode}/${model}`;
+			if (openCode < 2) return {
+				args: ["--model", selected],
+				env: childEnv
+			};
+			const inline = env.OPENCODE_CONFIG_CONTENT?.trim() ? parseJson(env.OPENCODE_CONFIG_CONTENT, "OPENCODE_CONFIG_CONTENT") : {};
+			childEnv.OPENCODE_CONFIG_CONTENT = JSON.stringify({
+				...inline,
+				model: selected
+			});
+			return {
+				args: ["--standalone"],
+				env: childEnv,
+				afterCommand: true,
+				note: "(OPENCODE_CONFIG_CONTENT model set)"
+			};
+		}
 		case "codex": return {
 			args: ["--profile", provider.codex],
 			env: childEnv
@@ -2884,15 +2911,15 @@ function launchOptions(id, env = process.env, provider = defaultProvider(env)) {
 			});
 			return {
 				args: ["--model", model],
-				env: childEnv
+				env: childEnv,
+				note: "(ANTHROPIC_* gateway environment set)"
 			};
 		default: throw new Error(`Cannot launch ${id}. Use the editor's model selector.`);
 	}
 }
-const RUN_NOTE = { claude: "(ANTHROPIC_* gateway environment set)" };
-function runExpansion(id, provider) {
-	const { args } = launchOptions(id, { [provider.envVar]: "placeholder" }, provider);
-	return [`${id} ${args.join(" ")}`, RUN_NOTE[id]].filter(Boolean).join("  ");
+function runExpansion(id, provider, installed = {}) {
+	const { args, note } = launchOptions(id, { [provider.envVar]: "placeholder" }, provider, installed);
+	return [`${id} ${args.join(" ")}`, note].filter(Boolean).join("  ");
 }
 const copilotModel = (provider) => JSON.stringify({
 	id: provider.model,
@@ -4796,6 +4823,7 @@ async function planAll(assistants, options, provider) {
 			name: NAMES[assistant.id],
 			detected: assistant.detected,
 			evidence: assistant.evidence || null,
+			binary: assistant.binary ?? null,
 			manual: MANUAL_IDS.includes(assistant.id),
 			error: null,
 			files: [],
@@ -4970,9 +4998,10 @@ 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 rows = runnable.map((id) => ({
 		command: `${apex} run ${id}`,
-		expansion: runExpansion(id, provider)
+		expansion: 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:`, [
@@ -5139,6 +5168,17 @@ function takeProvider(args) {
 		rest: args
 	};
 }
+const isDirectory = (path) => stat(path).then((info) => info.isDirectory(), () => false);
+async function launchArgs(options, args) {
+	const [first, ...rest] = args;
+	if (options.afterCommand && ["run", "mini"].includes(first)) return [
+		first,
+		...options.args,
+		...rest
+	];
+	if (options.afterCommand && first && !first.startsWith("-") && !await isDirectory(first)) return args;
+	return [...options.args, ...args];
+}
 async function commandRun(rest) {
 	const before = takeProvider(rest);
 	const [id, ...after] = before.rest;
@@ -5150,12 +5190,14 @@ async function commandRun(rest) {
 	const chosen = before.value ?? behind.value;
 	if (chosen !== null && !PROVIDER_IDS.includes(chosen)) throw new Error(`Unknown --provider. Choose from: ${PROVIDER_IDS.join(", ")}`);
 	const passed = behind.rest;
-	const options = launchOptions(id, process.env, chosen === null ? defaultProvider() : PROVIDERS[chosen]);
+	const provider = chosen === null ? defaultProvider() : PROVIDERS[chosen];
+	launchToken(process.env, provider);
 	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 args = passed[0] === "--" ? passed.slice(1) : passed;
-	const child = spawn(binary, [...options.args, ...args], {
+	const child = spawn(binary, await launchArgs(options, args), {
 		env: options.env,
 		stdio: "inherit",
 		shell: false

package/package.json

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