arisa 2.0.4 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "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/core/intent.ts

@@ -11,6 +11,7 @@
 
 import { config } from "../shared/config";
 import { createLogger } from "../shared/logger";
+import { buildBunWrappedAgentCliCommand, resolveAgentCliPath } from "../shared/ai-cli";
 
 const log = createLogger("core");
 
@@ -51,9 +52,15 @@ Rules:
 
 function buildCmd(cli: "claude" | "codex", prompt: string): string[] {
   if (cli === "claude") {
-    return ["claude", "--dangerously-skip-permissions", "--model", "haiku", "-p", prompt];
+    return buildBunWrappedAgentCliCommand(
+      "claude",
+      ["--dangerously-skip-permissions", "--model", "haiku", "-p", prompt],
+    );
   }
-  return ["codex", "exec", "--dangerously-bypass-approvals-and-sandbox", "-C", config.projectDir, prompt];
+  return buildBunWrappedAgentCliCommand(
+    "codex",
+    ["exec", "--dangerously-bypass-approvals-and-sandbox", "-C", config.projectDir, prompt],
+  );
 }
 
 // Track which CLI actually works (not just Bun.which, which can find broken shims)
@@ -75,8 +82,8 @@ async function trySpawn(prompt: string, cli: "claude" | "codex"): Promise<string
 function getCliOrder(): Array<"claude" | "codex"> {
   if (verifiedCli) return [verifiedCli];
   const order: Array<"claude" | "codex"> = [];
-  if (Bun.which("claude") !== null) order.push("claude");
-  if (Bun.which("codex") !== null) order.push("codex");
+  if (resolveAgentCliPath("claude") !== null) order.push("claude");
+  if (resolveAgentCliPath("codex") !== null) order.push("codex");
   return order;
 }
 

package/src/core/onboarding.ts

@@ -13,6 +13,7 @@
 import { config } from "../shared/config";
 import { createLogger } from "../shared/logger";
 import { getOnboardedUsers, addOnboarded as dbAddOnboarded, isOnboarded as dbIsOnboarded } from "../shared/db";
+import { isAgentCliInstalled } from "../shared/ai-cli";
 
 const log = createLogger("core");
 
@@ -46,8 +47,8 @@ export function checkDeps(): DepsStatus {
         : "Linux";
 
   return {
-    claude: Bun.which("claude") !== null,
-    codex: Bun.which("codex") !== null,
+    claude: isAgentCliInstalled("claude"),
+    codex: isAgentCliInstalled("codex"),
     openaiKey: !!config.openaiApiKey,
     os,
   };

package/src/core/processor.ts

@@ -16,6 +16,7 @@ import { getRecentHistory } from "./history";
 import { shouldContinue } from "./context";
 import { config } from "../shared/config";
 import { createLogger } from "../shared/logger";
+import { buildBunWrappedAgentCliCommand } from "../shared/ai-cli";
 import { existsSync, mkdirSync, readFileSync, appendFileSync } from "fs";
 import { join } from "path";
 
@@ -25,10 +26,7 @@ const PROMPT_PREVIEW_MAX = 220;
 export const CLAUDE_RATE_LIMIT_MESSAGE = "Claude is out of credits right now. Please try again in a few minutes.";
 export const CODEX_AUTH_REQUIRED_MESSAGE = [
   "Codex login is required.",
-  "Check the Arisa daemon logs now and complete the device-auth steps shown there.",
-  "If the login flow is not running, execute:",
-  "<code>codex login --device-auth</code>",
-  "Then send your message again.",
+  "Check the Arisa daemon logs now and complete the device-auth steps shown there."
 ].join("\n");
 
 function logActivity(backend: string, model: string | null, durationMs: number, status: string) {
@@ -147,7 +145,7 @@ async function runClaude(message: string, chatId: string): Promise<string> {
   log.info(`Claude spawn | cmd: claude --dangerously-skip-permissions --model ${model.model} -p <prompt>`);
   log.debug(`Claude prompt >>>>\n${prompt}\n<<<<`);
 
-  const proc = Bun.spawn(["claude", ...args], {
+  const proc = Bun.spawn(buildBunWrappedAgentCliCommand("claude", args), {
     cwd: config.projectDir,
     stdout: "pipe",
     stderr: "pipe",
@@ -218,7 +216,7 @@ export async function processWithCodex(message: string): Promise<string> {
   );
   log.debug(`Codex prompt >>>>\n${message}\n<<<<`);
 
-  const proc = Bun.spawn(["codex", ...args], {
+  const proc = Bun.spawn(buildBunWrappedAgentCliCommand("codex", args), {
     cwd: config.projectDir,
     stdout: "pipe",
     stderr: "pipe",

package/src/daemon/agent-cli.ts

@@ -11,10 +11,15 @@
 
 import { config } from "../shared/config";
 import { createLogger } from "../shared/logger";
+import {
+  buildBunWrappedAgentCliCommand,
+  resolveAgentCliPath,
+  type AgentCliName,
+} from "../shared/ai-cli";
 
 const log = createLogger("daemon");
 
-export type AgentCli = "claude" | "codex";
+export type AgentCli = AgentCliName;
 
 export interface CliExecutionResult {
   cli: AgentCli;
@@ -32,8 +37,8 @@ export interface CliFallbackOutcome {
 
 export function getAvailableAgentCli(): AgentCli[] {
   const order: AgentCli[] = [];
-  if (Bun.which("claude") !== null) order.push("claude");
-  if (Bun.which("codex") !== null) order.push("codex");
+  if (resolveAgentCliPath("claude") !== null) order.push("claude");
+  if (resolveAgentCliPath("codex") !== null) order.push("codex");
   return order;
 }
 
@@ -43,9 +48,15 @@ export function getAgentCliLabel(cli: AgentCli): string {
 
 function buildCommand(cli: AgentCli, prompt: string): string[] {
   if (cli === "claude") {
-    return ["claude", "--dangerously-skip-permissions", "--model", "sonnet", "-p", prompt];
+    return buildBunWrappedAgentCliCommand(
+      "claude",
+      ["--dangerously-skip-permissions", "--model", "sonnet", "-p", prompt],
+    );
   }
-  return ["codex", "exec", "--dangerously-bypass-approvals-and-sandbox", "-C", config.projectDir, prompt];
+  return buildBunWrappedAgentCliCommand(
+    "codex",
+    ["exec", "--dangerously-bypass-approvals-and-sandbox", "-C", config.projectDir, prompt],
+  );
 }
 
 async function runSingleCli(
@@ -116,4 +127,3 @@ function summarizeError(raw: string): string {
   if (!clean) return "no details";
   return clean.length > 200 ? `${clean.slice(0, 200)}...` : clean;
 }
-

package/src/daemon/codex-login.ts

@@ -3,18 +3,19 @@
  * @role Trigger Codex device auth flow from Daemon when auth errors are detected.
  * @responsibilities
  *   - Detect codex auth-required signals in Core responses
- *   - Run `codex login --device-auth` in background from daemon process
+ *   - Run `codex login --device-auth` (wrapped via Bun) in background from daemon process
  *   - Avoid duplicate runs with in-progress lock + cooldown
  * @effects Spawns codex CLI process, writes to daemon logs/terminal
  */
 
 import { config } from "../shared/config";
 import { createLogger } from "../shared/logger";
+import { buildBunWrappedAgentCliCommand } from "../shared/ai-cli";
 
 const log = createLogger("daemon");
 
 const AUTH_HINT_PATTERNS = [
-  /codex login --device-auth/i,
+  /codex.*login --device-auth/i,
   /codex is not authenticated on this server/i,
   /missing bearer authentication in header/i,
 ];
@@ -59,12 +60,12 @@ export function maybeStartCodexDeviceAuth(rawCoreText: string, chatId?: string):
 }
 
 async function runCodexDeviceAuth(): Promise<void> {
-  log.warn("Codex auth required. Starting `codex login --device-auth` now.");
+  log.warn("Codex auth required. Starting `bun --bun <path-to-codex> login --device-auth` now.");
   log.warn("Complete device auth using the URL/code printed below in this Arisa terminal.");
 
   let proc: ReturnType<typeof Bun.spawn>;
   try {
-    proc = Bun.spawn(["codex", "login", "--device-auth"], {
+    proc = Bun.spawn(buildBunWrappedAgentCliCommand("codex", ["login", "--device-auth"]), {
       cwd: config.projectDir,
       stdin: "inherit",
       stdout: "inherit",

package/src/shared/ai-cli.ts

@@ -0,0 +1,22 @@
+/**
+ * @module shared/ai-cli
+ * @role Resolve agent CLI binaries and execute them via Bun runtime.
+ */
+
+export type AgentCliName = "claude" | "codex";
+
+export function resolveAgentCliPath(cli: AgentCliName): string | null {
+  return Bun.which(cli);
+}
+
+export function isAgentCliInstalled(cli: AgentCliName): boolean {
+  return resolveAgentCliPath(cli) !== null;
+}
+
+export function buildBunWrappedAgentCliCommand(cli: AgentCliName, args: string[]): string[] {
+  const cliPath = resolveAgentCliPath(cli);
+  if (!cliPath) {
+    throw new Error(`${cli} CLI not found in PATH`);
+  }
+  return ["bun", "--bun", cliPath, ...args];
+}