arisa 2.0.6 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Arisa - dynamic agent runtime with daemon/core architecture that evolves through user interaction",
   "preferGlobal": true,
   "bin": {

package/src/shared/ai-cli.ts

@@ -3,10 +3,51 @@
  * @role Resolve agent CLI binaries and execute them via Bun runtime.
  */
 
+import { existsSync } from "fs";
+import { delimiter, dirname, join } from "path";
+
 export type AgentCliName = "claude" | "codex";
 
+function unique(paths: Array<string | null | undefined>): string[] {
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const p of paths) {
+    if (!p) continue;
+    if (seen.has(p)) continue;
+    seen.add(p);
+    out.push(p);
+  }
+  return out;
+}
+
+function cliOverrideEnvVar(cli: AgentCliName): string | undefined {
+  return cli === "codex" ? process.env.ARISA_CODEX_BIN : process.env.ARISA_CLAUDE_BIN;
+}
+
+function candidatePaths(cli: AgentCliName): string[] {
+  const bunInstall = process.env.BUN_INSTALL?.trim();
+  const bunDir = dirname(process.execPath);
+  const fromPath = Bun.which(cli);
+  const fromEnvPath = (process.env.PATH || "")
+    .split(delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+    .map((entry) => join(entry, cli));
+
+  return unique([
+    cliOverrideEnvVar(cli),
+    bunInstall ? join(bunInstall, "bin", cli) : null,
+    join(bunDir, cli),
+    fromPath,
+    ...fromEnvPath,
+  ]);
+}
+
 export function resolveAgentCliPath(cli: AgentCliName): string | null {
-  return Bun.which(cli);
+  for (const candidate of candidatePaths(cli)) {
+    if (existsSync(candidate)) return candidate;
+  }
+  return null;
 }
 
 export function isAgentCliInstalled(cli: AgentCliName): boolean {
@@ -16,7 +57,7 @@ export function isAgentCliInstalled(cli: AgentCliName): boolean {
 export function buildBunWrappedAgentCliCommand(cli: AgentCliName, args: string[]): string[] {
   const cliPath = resolveAgentCliPath(cli);
   if (!cliPath) {
-    throw new Error(`${cli} CLI not found in PATH`);
+    throw new Error(`${cli} CLI not found`);
   }
   return ["bun", "--bun", cliPath, ...args];
 }