arisa 2.0.5 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Arisa - dynamic agent runtime with daemon/core architecture that evolves through user interaction",
   "preferGlobal": true,
   "bin": {
@@ -29,8 +29,7 @@
   "dependencies": {
     "croner": "^9.0.0",
     "crypto-js": "^4.2.0",
-    "deepbase": "^3.4.6",
-    "deepbase-json": "^3.4.6",
+    "deepbase": "^3.4.9",
     "elevenlabs": "^1.59.0",
     "grammy": "^1.21.0",
     "openai": "^6.19.0",

package/src/core/index.ts

@@ -49,16 +49,25 @@ function defaultBackend(): "claude" | "codex" {
 }
 
 function getBackend(chatId: string): "claude" | "codex" {
+  const deps = checkDeps();
+
+  const preferInstalled = (candidate: "claude" | "codex"): "claude" | "codex" => {
+    if (candidate === "claude" && !deps.claude && deps.codex) return "codex";
+    if (candidate === "codex" && !deps.codex && deps.claude) return "claude";
+    return candidate;
+  };
+
   const current = backendState.get(chatId);
-  if (current) return current;
+  if (current) return preferInstalled(current);
 
   const fromHistory = getLastBackend(chatId);
   if (fromHistory) {
-    backendState.set(chatId, fromHistory);
-    return fromHistory;
+    const resolved = preferInstalled(fromHistory);
+    backendState.set(chatId, resolved);
+    return resolved;
   }
 
-  return defaultBackend();
+  return preferInstalled(defaultBackend());
 }
 
 // Initialize auth + scheduler + attachments
@@ -329,9 +338,15 @@ ${messageText}`;
           return Response.json(response);
         }
 
+        const deps = checkDeps();
+        if (!deps.claude && !deps.codex) {
+          return Response.json({
+            text: "No AI CLI is installed. Install at least one:\n<code>bun add -g @anthropic-ai/claude-code</code>\n<code>bun add -g @openai/codex</code>",
+          } as CoreResponse);
+        }
+
         // Route based on current backend state
         const backend = getBackend(msg.chatId);
-        const deps = checkDeps();
         const canFallback = backend === "codex" ? deps.claude : deps.codex;
         let agentResponse: string;
         let historyResponse: string | null = null;
@@ -363,6 +378,11 @@ ${messageText}`;
         } else {
           try {
             agentResponse = await processWithClaude(enrichedMessage, msg.chatId);
+            if (agentResponse.startsWith("Error:") && canFallback) {
+              log.warn("Claude failed, falling back to Codex");
+              agentResponse = await processWithCodex(enrichedMessage);
+              usedBackend = "codex";
+            }
             if (isClaudeRateLimitResponse(agentResponse) && canFallback) {
               log.warn("Claude credits exhausted, falling back to Codex");
               const codexResponse = await processWithCodex(enrichedMessage);

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];
 }