agentboss 0.1.2 → 0.1.4

package/server/execution/job.js

@@ -32,6 +32,7 @@ const { loadAdvice } = require('../llm/advice');
 const { loadProjectAdvice } = require('../llm/project-advice');
 const { saveDb } = require('../db/connection');
 const { runExecutor, canSpawn } = require('./runner');
+const { detectAllCli } = require('../llm/cli-runner');
 const {
   buildExecutionPrompt,
   buildProjectExecutionPrompt,
@@ -318,6 +319,56 @@ function cleanupOrphans(db) {
 //  blocked.
 // ---------------------------------------------------------------------------
 
+const VALID_EXECUTORS = new Set(['opencode', 'claude']);
+const VALID_CLI_PREFS = new Set(['auto', 'opencode', 'claude']);
+
+/**
+ * Read the user's CLI preference from user_settings (no caching — the
+ * execution path is low-volume; freshness matters more than micro-perf).
+ */
+function getCliPreference(db) {
+  const raw = String(getSetting(db, 'llm_tool_preference') || 'auto').toLowerCase();
+  return VALID_CLI_PREFS.has(raw) ? raw : 'auto';
+}
+
+/**
+ * Decide which executor to spawn.  Priority:
+ *   1. Explicit request override (`executorOpt`) — always wins, even
+ *      over user preference: an API caller that says "run with claude"
+ *      gets claude.  Validated against the whitelist.
+ *   2. User preference (`llm_tool_preference`) — when set to a concrete
+ *      CLI (opencode / claude), honoured if it's installed; if not
+ *      installed we fall back to whatever IS, so a stale preference
+ *      can't silently disable execution.
+ *   3. The LLM's recommendation in `item.executor` — used iff the user
+ *      preference is 'auto' (the default).
+ *   4. Hard default `'opencode'`.
+ *
+ * Returns `null` when no whitelisted CLI is installed at all.
+ */
+async function resolveExecutor(db, executorOpt, item) {
+  // 1. Explicit override — accept as-is if whitelisted.
+  if (executorOpt && VALID_EXECUTORS.has(executorOpt)) return executorOpt;
+
+  const pref = getCliPreference(db);
+  const itemExec = (item && VALID_EXECUTORS.has(item.executor)) ? item.executor : null;
+
+  // 2. Concrete user preference: try to honour it, fall back if missing.
+  if (pref !== 'auto') {
+    const all = await detectAllCli();
+    const wanted = all.find((c) => c.name === pref);
+    if (wanted && wanted.available) return pref;
+    // preferred CLI vanished — fall through to itemExec / first available
+    const itemAvail = itemExec && all.find((c) => c.name === itemExec && c.available);
+    if (itemAvail) return itemExec;
+    const anyAvail = all.find((c) => c.available && VALID_EXECUTORS.has(c.name));
+    return anyAvail ? anyAvail.name : null;
+  }
+
+  // 3 + 4. Auto: trust the LLM's pick, else default to opencode.
+  return itemExec || 'opencode';
+}
+
 function describeCliCommand(executor, cwd) {
   // What spawnRunAsync → runExecutor will actually invoke.  Mirrors
   // server/execution/runner.js (`opencode run` / `claude -p`).  The
@@ -340,7 +391,7 @@ function describeCliCommand(executor, cwd) {
   };
 }
 
-function previewExecution(db, { sessionId, adviceKey, executor: executorOpt }) {
+async function previewExecution(db, { sessionId, adviceKey, executor: executorOpt }) {
   const session = getSessionById(db, sessionId);
   if (!session) return { ok: false, reason: 'no-session' };
 
@@ -350,7 +401,7 @@ function previewExecution(db, { sessionId, adviceKey, executor: executorOpt }) {
   const item = findAdviceItem(advice, adviceKey);
   if (!item) return { ok: false, reason: 'no-advice-item' };
 
-  const executor = executorOpt || item.executor || 'opencode';
+  const executor = (await resolveExecutor(db, executorOpt, item)) || 'opencode';
   // Normalise — session.project may carry an OpenCode-source path like
   // "C//felix/code/X" that won't pass fs.existsSync; canonicalProject
   // re-inserts the missing ":".  Mirrors previewProjectExecution.
@@ -382,7 +433,7 @@ function previewExecution(db, { sessionId, adviceKey, executor: executorOpt }) {
   };
 }
 
-function previewProjectExecution(db, {
+async function previewProjectExecution(db, {
   project: projectRaw, scope, windowFrom = '', windowTo = '',
   adviceKey, executor: executorOpt,
 }) {
@@ -402,7 +453,7 @@ function previewProjectExecution(db, {
   const item = findAdviceItem(cached.payload, adviceKey);
   if (!item) return { ok: false, reason: 'no-advice-item' };
 
-  const executor = executorOpt || item.executor || 'opencode';
+  const executor = (await resolveExecutor(db, executorOpt, item)) || 'opencode';
 
   const prompt = buildProjectExecutionPrompt({
     advice: item,
@@ -491,10 +542,10 @@ async function startExecution(db, opts) {
       return { ok: false, reason: 'not-whitelisted', extra: { project } };
     }
 
-    // 7. Executor choice & availability.
-    const executor = executorOpt || item.executor || 'opencode';
-    if (executor !== 'opencode' && executor !== 'claude') {
-      return { ok: false, reason: 'no-cli', extra: { executor } };
+    // 7. Executor choice & availability — honour user preference.
+    const executor = await resolveExecutor(db, executorOpt, item);
+    if (!executor || !VALID_EXECUTORS.has(executor)) {
+      return { ok: false, reason: 'no-cli', extra: { executor: executor || null } };
     }
     const cliOk = await canSpawn(executor);
     if (!cliOk) return { ok: false, reason: 'no-cli', extra: { executor } };
@@ -614,10 +665,10 @@ async function startProjectExecution(db, opts) {
       return { ok: false, reason: 'not-whitelisted', extra: { project } };
     }
 
-    // 6. Executor.
-    const executor = executorOpt || item.executor || 'opencode';
-    if (executor !== 'opencode' && executor !== 'claude') {
-      return { ok: false, reason: 'no-cli', extra: { executor } };
+    // 6. Executor — honour user preference.
+    const executor = await resolveExecutor(db, executorOpt, item);
+    if (!executor || !VALID_EXECUTORS.has(executor)) {
+      return { ok: false, reason: 'no-cli', extra: { executor: executor || null } };
     }
     const cliOk = await canSpawn(executor);
     if (!cliOk) return { ok: false, reason: 'no-cli', extra: { executor } };

package/server/llm/advice.js

@@ -49,21 +49,28 @@ let _settingsCache = null;
 let _settingsCacheAt = 0;
 const SETTINGS_TTL_MS = 10_000;
 
+const VALID_CLI_PREFS = new Set(['auto', 'opencode', 'claude']);
+
 function getSettings(db) {
   const now = Date.now();
   if (_settingsCache && now - _settingsCacheAt < SETTINGS_TTL_MS) {
     return _settingsCache;
   }
   const rows = db.exec(
-    "SELECT key, value FROM user_settings WHERE key = 'enable_llm_judge'"
+    "SELECT key, value FROM user_settings WHERE key IN ('enable_llm_judge', 'llm_tool_preference')"
   );
   let enable = false;
+  let pref = 'auto';
   if (rows[0]) {
-    for (const [, v] of rows[0].values) {
-      enable = String(v) === '1' || String(v).toLowerCase() === 'true';
+    for (const [k, v] of rows[0].values) {
+      if (k === 'enable_llm_judge') enable = String(v) === '1' || String(v).toLowerCase() === 'true';
+      if (k === 'llm_tool_preference') {
+        const p = String(v || '').toLowerCase();
+        pref = VALID_CLI_PREFS.has(p) ? p : 'auto';
+      }
     }
   }
-  _settingsCache = { enable_llm_judge: enable };
+  _settingsCache = { enable_llm_judge: enable, llm_tool_preference: pref };
   _settingsCacheAt = now;
   return _settingsCache;
 }
@@ -257,8 +264,9 @@ async function generateAdvice(db, sessionId, opts = {}) {
       }
     }
 
-    // 3. CLI detection
-    const cli = await detectAvailableCli();
+    // 3. CLI detection — honour user preference
+    const pref = settings.llm_tool_preference || 'auto';
+    const cli = await detectAvailableCli(pref);
     if (!cli) { log('no CLI'); return { ok: false, reason: 'no-cli' }; }
 
     // 4–5. truncate + build prompt
@@ -267,7 +275,7 @@ async function generateAdvice(db, sessionId, opts = {}) {
     log('spawning', cli.name, 'prompt bytes=', prompt.length, 'truncated=', ctx.truncated);
 
     // 6. run under concurrency slot — 90 s is plenty for prompts up to ~80 KB
-    const result = await withSlot(() => runJudge({ prompt, timeoutMs: 90_000 }));
+    const result = await withSlot(() => runJudge({ prompt, timeoutMs: 90_000, preferredCli: pref }));
     log('result ok=', result.ok, 'reason=', result.reason);
 
     if (!result.ok) {