@mrrlin-dev/external-agents 0.3.4 → 0.3.6

package/cli.js

@@ -227,10 +227,20 @@ function cmdInit(flags) {
   const child = spawn(process.execPath, [uiPath], { stdio: "inherit", env });
   // Give the UI ~600ms to bind before opening the browser (loopback listen is
   // usually instantaneous but we do not want the browser to open on a not-yet-
-  // bound port).
+  // bound port). Browser-open is best-effort — swallow BOTH sync spawn errors
+  // AND async 'error' events (ENOENT is emitted async, not thrown; without a
+  // listener it crashes the process — this is what breaks curl|bash on a
+  // headless Linux box that has no xdg-open installed). The UI keeps running.
   setTimeout(() => {
-    try { spawn(opener, openerArgs, { stdio: "ignore", detached: true }).unref(); }
-    catch { /* browser open is best-effort; UI is still up on ${url} */ }
+    try {
+      const opener_proc = spawn(opener, openerArgs, { stdio: "ignore", detached: true });
+      opener_proc.on("error", (err) => {
+        console.error(`external-agents init: could not launch browser (${err.code || err.message}) — open ${url} manually.`);
+      });
+      opener_proc.unref();
+    } catch (err) {
+      console.error(`external-agents init: could not launch browser (${err.message}) — open ${url} manually.`);
+    }
   }, 600);
   child.on("exit", (code) => process.exit(code ?? 0));
   process.on("SIGINT",  () => child.kill("SIGINT"));

package/lib/state.js

@@ -57,25 +57,28 @@ export function writeState(patch) {
   }
 }
 
+// Probe an agent's usability. Transport-aware — if EITHER transport is usable,
+// the entry is healthy. This is important because most economy-flow entries
+// (Groq, Cerebras, OpenRouter, Gemini, DeepSeek, etc.) work via generate_new
+// (native fetch, no binary needed) and do NOT require aider. Previously the
+// probe short-circuited on aider-missing and marked everything not_installed
+// even when the operator only wanted native fetch — that broke the "just
+// paste API keys and go" flow on any host without aider installed.
+//
+// Precedence:
+//   1. generate_new usable (URL configured + env var set OR Ollama sentinel)
+//      → healthy. Aider is not required.
+//   2. edit_exists usable (binary on PATH + auth satisfied) → healthy.
+//   3. Neither → the more informative failure wins (needs_auth > not_installed).
 export function probeInstalled(agentEntry) {
-  const cliCmd = agentEntry?.transports?.edit_exists;
-  if (!cliCmd || typeof cliCmd !== "string") {
-    return { state: "errored_transient", note: "no cli transport" };
-  }
-  const bin = cliCmd.trim().split(/\s+/)[0];
-  const r = spawnSync("command", ["-v", bin], { shell: "/bin/bash" });
-  if (r.status !== 0) {
-    return { state: "not_installed", note: `binary missing: ${bin}` };
-  }
-
-  // Binary present. Check auth prerequisites:
-  //   - per-entry `env` override (with optional @file: refs) OR
-  //   - `auth: "env:XXX"` — the var must be in process.env
-  // If a per-entry env override is present, it takes precedence: we verify
-  // every @file: reference resolves. Otherwise fall back to auth-field.
   const auth = agentEntry.auth || "";
+  const gen = agentEntry.transports?.generate_new;
+  const cli = agentEntry.transports?.edit_exists;
+  if (!gen && !cli) return { state: "errored_transient", note: "no transport declared" };
 
-  if (agentEntry.env && typeof agentEntry.env === "object") {
+  // Resolve per-entry env overrides once (used by both transport checks).
+  const envOverrideReady = (() => {
+    if (!agentEntry.env || typeof agentEntry.env !== "object") return { ok: true, note: null };
     for (const [k, v] of Object.entries(agentEntry.env)) {
       if (typeof v === "string" && v.startsWith("@file:")) {
         let p = v.slice("@file:".length);
@@ -84,30 +87,58 @@ export function probeInstalled(agentEntry) {
           const s = fs.statSync(p);
           if (!s.isFile()) throw new Error("not a regular file");
         } catch (e) {
-          return { state: "needs_auth", note: `env override ${k}: cannot read ${p}` };
+          return { ok: false, note: `env override ${k}: cannot read ${p}` };
         }
       }
     }
-    return { state: "healthy", note: `binary present: ${bin}; per-entry env resolved` };
-  }
+    return { ok: true, note: null };
+  })();
 
-  if (auth.startsWith("env:")) {
-    const varName = auth.slice("env:".length).split(/\s+/)[0];
-    if (!process.env[varName]) {
-      return { state: "needs_auth", note: `env var ${varName} not set (add to shell or ADR-0016 store)` };
+  // ---- Attempt (1): generate_new transport is usable ---------------------
+  if (gen && gen.url) {
+    const genEnv = gen.env;
+    const isOllama = genEnv === "OLLAMA_UNUSED_KEY";
+    const envSatisfied = isOllama
+      || !genEnv                                             // no env → no auth wall
+      || (agentEntry.env && agentEntry.env[genEnv])          // per-entry override
+      || !!process.env[genEnv];                              // process env
+    if (envOverrideReady.ok && envSatisfied) {
+      return {
+        state: "healthy",
+        note: isOllama || !genEnv
+          ? `generate_new ready (no api key required)`
+          : `generate_new ready (${genEnv} set)`,
+      };
     }
   }
 
-  // For entries with only generate transport (no cli), the "binary" is aider-agnostic
-  // (native fetch). Also handle the Ollama sentinel — no real env var needed.
-  const genEnv = agentEntry.transports?.generate_new?.env;
-  if (genEnv && genEnv !== "OLLAMA_UNUSED_KEY" && !process.env[genEnv] && !(agentEntry.env && agentEntry.env[genEnv])) {
-    // If we already passed the cli auth check above, this is a "generate needs its own env" case.
-    // Skip when auth check already flagged the same var.
-    if (!auth.startsWith("env:") || !auth.includes(genEnv)) {
-      return { state: "needs_auth", note: `generate env var ${genEnv} not set` };
+  // ---- Attempt (2): edit_exists transport is usable ----------------------
+  if (cli && typeof cli === "string") {
+    const bin = cli.trim().split(/\s+/)[0];
+    const r = spawnSync("command", ["-v", bin], { shell: "/bin/bash" });
+    if (r.status === 0) {
+      if (!envOverrideReady.ok) return { state: "needs_auth", note: envOverrideReady.note };
+      // Auth wall from the top-level `auth:` field (subscription CLI vs env var).
+      if (auth.startsWith("env:")) {
+        const varName = auth.slice("env:".length).split(/\s+/)[0];
+        if (!process.env[varName]) {
+          return { state: "needs_auth", note: `env var ${varName} not set (paste via UI or run: external-agents set-credential ${varName})` };
+        }
+      }
+      return { state: "healthy", note: `binary present: ${bin}` };
     }
   }
 
-  return { state: "healthy", note: `binary present: ${bin}` };
+  // ---- Both attempts failed — pick the most informative failure ---------
+  if (gen && gen.url && gen.env && gen.env !== "OLLAMA_UNUSED_KEY") {
+    return {
+      state: "needs_auth",
+      note: `env var ${gen.env} not set (paste via UI or run: external-agents set-credential ${gen.env})`,
+    };
+  }
+  if (cli) {
+    const bin = cli.trim().split(/\s+/)[0];
+    return { state: "not_installed", note: `binary missing: ${bin}` };
+  }
+  return { state: "errored_transient", note: "no usable transport" };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/external-agents",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "One MCP server for every LLM you talk to \u2014 direct-API dispatcher across Gemini, DeepSeek, Groq, OpenRouter, Cerebras, and more. Part of mrrlin.com.",
   "type": "module",
   "main": "server.js",