@mrrlin-dev/external-agents 0.3.5 → 0.3.7

package/agents.yaml

@@ -366,6 +366,9 @@ agents:
   # dispatch that failed. Which of the two is "primary" is decided by the
   # consumer (mrrlin will make this operator-configurable in a later slice);
   # both are registered here so either can serve.
+  # Codex family — subscription-backed, two tiers so `escalate_to_pro` has a
+  # target. `codex` (default weak-strong) works on every Codex plan; `codex-pro`
+  # picks the strongest model on your plan via `-m gpt-5.4-codex`.
   - id: codex
     provider: openai
     model: gpt-5.2-codex
@@ -376,7 +379,20 @@ agents:
     transports:
       edit_exists: "codex exec"
 
-  - id: claude
+  - id: codex-pro
+    provider: openai
+    model: gpt-5.4-codex
+    tier: strong
+    tags: [reasoning]
+    auth: "cli:codex"
+    usage_url: "https://platform.openai.com/usage"
+    transports:
+      edit_exists: "codex exec -m gpt-5.4-codex"
+
+  # Claude family — subscription-backed, two tiers. `claude-opus` is the
+  # strongest, `claude-sonnet` (below) is weak-tier for the atomic-executor
+  # pool + `/consensus` terminal picks.
+  - id: claude-opus
     provider: anthropic
     model: claude-opus-4-7
     tier: strong
@@ -384,7 +400,7 @@ agents:
     auth: "cli:claude"
     usage_url: "https://console.anthropic.com/settings/usage"
     transports:
-      edit_exists: "claude --print"
+      edit_exists: "claude --print --model claude-opus-4-7"
 
   # Weak-tier Sonnet — same Claude subscription, cheaper model. Included in
   # default `pick_agents` runs (weak filter passes it), so `dispatch` /

package/install.sh

@@ -31,6 +31,39 @@ say "Installing @mrrlin-dev/external-agents globally via npm…"
 npm install -g @mrrlin-dev/external-agents
 ok "Installed. Binaries: external-agents, external-agents-mcp"
 
+# 1b) aider (Python) — required for the `edit_exists` transport that gives
+# real agentic file-editing behavior across ~100 providers via LiteLLM. It is
+# a separate Python package because npm cannot install Python code. Best-
+# effort: pipx first (isolated, cleanest), then pip3 --user, then a warning.
+# We do NOT fail the install if none of those work — the operator can still
+# use generate_new transport for free-tier providers, and install aider later.
+say "Installing aider (Python — for agentic file-editing transport)…"
+if command -v aider >/dev/null 2>&1; then
+  ok "aider already installed: $(aider --version 2>&1 | head -1)"
+elif command -v pipx >/dev/null 2>&1; then
+  pipx install aider-chat >/dev/null 2>&1 && ok "aider installed via pipx." || warn "pipx install aider-chat failed. Install manually: pipx install aider-chat"
+elif command -v pip3 >/dev/null 2>&1; then
+  # Some distros gate pip3 with PEP 668 externally-managed marker — try
+  # --user first, then --break-system-packages as a last resort.
+  if pip3 install --user aider-chat >/dev/null 2>&1; then
+    ok "aider installed via pip3 --user (add ~/.local/bin to PATH if 'aider' is not found)."
+  elif pip3 install --user --break-system-packages aider-chat >/dev/null 2>&1; then
+    ok "aider installed via pip3 --user --break-system-packages."
+  else
+    warn "pip3 install aider-chat failed. Install manually: pip install aider-chat"
+  fi
+elif command -v python3 >/dev/null 2>&1; then
+  python3 -m ensurepip --user >/dev/null 2>&1 || true
+  if python3 -m pip install --user aider-chat >/dev/null 2>&1; then
+    ok "aider installed via python3 -m pip --user (add ~/.local/bin to PATH if 'aider' is not found)."
+  else
+    warn "python3 -m pip install aider-chat failed. Install manually: pip install aider-chat"
+  fi
+else
+  warn "python3 not found on PATH — skipping aider. Install Python 3.10+ then run: pip install aider-chat"
+  warn "  Free-tier providers (Groq / Cerebras / OpenRouter / Gemini / DeepSeek) still work through the 'generate_new' transport (native fetch — no aider required)."
+fi
+
 # 2) Register the MCP server with every host we can find. Errors are non-fatal
 # because the operator may only use one of them.
 if command -v claude >/dev/null 2>&1; then

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.5",
+  "version": "0.3.7",
   "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",