swarm-code 0.1.7 → 0.1.9

package/dist/interactive-swarm.js

@@ -21,7 +21,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as readline from "node:readline";
 // Dynamic imports — ensures env.js has set process.env BEFORE pi-ai loads
-const { getModels, getProviders } = await import("@mariozechner/pi-ai");
+await import("@mariozechner/pi-ai");
 const { PythonRepl } = await import("./core/repl.js");
 const { runRlmLoop } = await import("./core/rlm.js");
 const { loadConfig } = await import("./config.js");
@@ -34,6 +34,7 @@ await import("./agents/aider.js");
 import { randomBytes } from "node:crypto";
 import { EpisodicMemory } from "./memory/episodic.js";
 import { buildSwarmSystemPrompt } from "./prompts/orchestrator.js";
+import { resolveModel } from "./routing/model-resolver.js";
 import { classifyTaskComplexity, describeAvailableAgents, FailureTracker, routeTask } from "./routing/model-router.js";
 import { ThreadManager } from "./threads/manager.js";
 import { ThreadDashboard } from "./ui/dashboard.js";
@@ -183,81 +184,6 @@ function scanDirectory(dir, maxFiles = 200, maxTotalSize = 2 * 1024 * 1024) {
     }
     return parts.join("\n");
 }
-// ── Model resolution (mirrored from swarm.ts) ───────────────────────────────
-function resolveModel(modelId) {
-    const providerKeys = {
-        anthropic: "ANTHROPIC_API_KEY",
-        openai: "OPENAI_API_KEY",
-        google: "GEMINI_API_KEY",
-    };
-    const defaultModels = {
-        anthropic: "claude-sonnet-4-6",
-        openai: "gpt-4o",
-        google: "gemini-2.5-flash",
-    };
-    const knownProviders = new Set(Object.keys(providerKeys));
-    let model;
-    let resolvedProvider = "";
-    for (const provider of getProviders()) {
-        if (!knownProviders.has(provider))
-            continue;
-        const key = providerKeys[provider];
-        if (!process.env[key])
-            continue;
-        for (const m of getModels(provider)) {
-            if (m.id === modelId) {
-                model = m;
-                resolvedProvider = provider;
-                break;
-            }
-        }
-        if (model)
-            break;
-    }
-    if (!model) {
-        for (const provider of getProviders()) {
-            if (knownProviders.has(provider))
-                continue;
-            for (const m of getModels(provider)) {
-                if (m.id === modelId) {
-                    model = m;
-                    resolvedProvider = provider;
-                    break;
-                }
-            }
-            if (model)
-                break;
-        }
-    }
-    if (!model) {
-        for (const [prov, envKey] of Object.entries(providerKeys)) {
-            if (!process.env[envKey])
-                continue;
-            const fallbackId = defaultModels[prov];
-            if (!fallbackId)
-                continue;
-            for (const p of getProviders()) {
-                if (p !== prov)
-                    continue;
-                for (const m of getModels(p)) {
-                    if (m.id === fallbackId) {
-                        model = m;
-                        resolvedProvider = prov;
-                        logWarn(`Using ${fallbackId} (${prov}) — model "${modelId}" not found`);
-                        break;
-                    }
-                }
-                if (model)
-                    break;
-            }
-            if (model)
-                break;
-        }
-    }
-    if (!model)
-        return null;
-    return { model, provider: resolvedProvider };
-}
 // ── Formatting helpers ──────────────────────────────────────────────────────
 function formatDuration(ms) {
     if (ms < 1000)
@@ -663,10 +589,18 @@ export async function runInteractiveSwarm(rawArgs) {
         config.max_session_budget_usd = args.maxBudget;
     if (args.autoRoute)
         config.auto_model_selection = true;
-    // Resolve orchestrator model
-    const resolved = resolveModel(args.orchestratorModel);
+    // Resolve orchestrator model — prefer CLI arg, then config's default_model
+    const orchestratorModelId = args.orchestratorModel !== "claude-sonnet-4-6"
+        ? args.orchestratorModel
+        : config.default_model || args.orchestratorModel;
+    // For standard pi-ai models, strip provider prefix (e.g. "anthropic/claude-sonnet-4-6" → "claude-sonnet-4-6")
+    // Ollama/OpenRouter prefixes are kept as-is (handled by resolveModel)
+    const modelLookupId = orchestratorModelId.startsWith("ollama/") || orchestratorModelId.startsWith("openrouter/")
+        ? orchestratorModelId
+        : orchestratorModelId.replace(/^(anthropic|openai|google)\//, "");
+    const resolved = resolveModel(modelLookupId, logWarn);
     if (!resolved) {
-        logError(`Could not find model "${args.orchestratorModel}"`, "Set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GEMINI_API_KEY in your .env file");
+        logError(`Could not find model "${orchestratorModelId}"`, "Set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GEMINI_API_KEY in your .env file, or use Ollama/OpenRouter");
         process.exit(1);
     }
     // Initialize episodic memory and failure tracker

package/dist/routing/model-resolver.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Model resolver — resolves model IDs to pi-ai Model objects.
+ *
+ * Handles three cases:
+ *   1. Standard pi-ai models (anthropic, openai, google) — looked up from pi-ai registry
+ *   2. Ollama models (ollama/*) — creates synthetic Model<"openai-completions"> pointing at localhost:11434
+ *   3. OpenRouter models (openrouter/*) — creates synthetic Model<"openai-completions"> pointing at openrouter.ai
+ *
+ * This preserves the RLM loop for all backends — the orchestrator always uses pi-ai's completeSimple().
+ */
+import type { Api, Model } from "@mariozechner/pi-ai";
+export interface ResolvedModel {
+    model: Model<Api>;
+    provider: string;
+}
+/**
+ * Resolve a model ID to a pi-ai Model object.
+ *
+ * Supports:
+ *   - "ollama/deepseek-coder-v2" → Ollama local model
+ *   - "openrouter/auto" → OpenRouter cloud model
+ *   - "claude-sonnet-4-6" → standard pi-ai model lookup
+ *   - Falls back to any available provider's default model
+ */
+export declare function resolveModel(modelId: string, warnFn?: (msg: string) => void): ResolvedModel | null;

package/dist/routing/model-resolver.js

@@ -0,0 +1,185 @@
+/**
+ * Model resolver — resolves model IDs to pi-ai Model objects.
+ *
+ * Handles three cases:
+ *   1. Standard pi-ai models (anthropic, openai, google) — looked up from pi-ai registry
+ *   2. Ollama models (ollama/*) — creates synthetic Model<"openai-completions"> pointing at localhost:11434
+ *   3. OpenRouter models (openrouter/*) — creates synthetic Model<"openai-completions"> pointing at openrouter.ai
+ *
+ * This preserves the RLM loop for all backends — the orchestrator always uses pi-ai's completeSimple().
+ */
+const { getModels, getProviders } = await import("@mariozechner/pi-ai");
+const PROVIDER_KEYS = {
+    anthropic: "ANTHROPIC_API_KEY",
+    openai: "OPENAI_API_KEY",
+    google: "GEMINI_API_KEY",
+};
+const DEFAULT_MODELS = {
+    anthropic: "claude-sonnet-4-6",
+    openai: "gpt-4o",
+    google: "gemini-2.5-flash",
+};
+/**
+ * Create a synthetic pi-ai Model for Ollama (OpenAI-compatible API at localhost:11434).
+ *
+ * Uses provider "openai" so pi-ai's API key lookup resolves to OPENAI_API_KEY.
+ * We set a dummy OPENAI_API_KEY if none exists — Ollama ignores auth headers.
+ */
+function createOllamaModel(modelId) {
+    const shortId = modelId.replace("ollama/", "");
+    // pi-ai requires an API key for the "openai" provider. Ollama doesn't need one,
+    // but we must satisfy pi-ai's check. Set a dummy key if no real one exists.
+    if (!process.env.OPENAI_API_KEY) {
+        process.env.OPENAI_API_KEY = "ollama-local";
+    }
+    return {
+        id: shortId,
+        name: shortId,
+        api: "openai-completions",
+        provider: "openai",
+        baseUrl: "http://localhost:11434/v1",
+        reasoning: false,
+        input: ["text"],
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+        contextWindow: 32768,
+        maxTokens: 4096,
+        compat: {
+            supportsStore: false,
+            supportsDeveloperRole: false,
+            supportsReasoningEffort: false,
+            supportsUsageInStreaming: false,
+            maxTokensField: "max_tokens",
+            requiresToolResultName: false,
+            requiresAssistantAfterToolResult: false,
+            requiresThinkingAsText: false,
+            requiresMistralToolIds: false,
+            thinkingFormat: "openai",
+            supportsStrictMode: false,
+        },
+    };
+}
+/**
+ * Create a synthetic pi-ai Model for OpenRouter (OpenAI-compatible API).
+ */
+function createOpenRouterModel(modelId) {
+    const shortId = modelId.replace("openrouter/", "");
+    const apiKey = process.env.OPENROUTER_API_KEY || "";
+    return {
+        id: shortId,
+        name: shortId,
+        api: "openai-completions",
+        provider: "openrouter",
+        baseUrl: "https://openrouter.ai/api/v1",
+        reasoning: false,
+        input: ["text"],
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+        contextWindow: 128000,
+        maxTokens: 4096,
+        headers: {
+            Authorization: `Bearer ${apiKey}`,
+            "HTTP-Referer": "https://github.com/kingjulio8238/swarm-code",
+            "X-Title": "swarm-code",
+        },
+        compat: {
+            supportsStore: false,
+            supportsDeveloperRole: false,
+            supportsReasoningEffort: false,
+            supportsUsageInStreaming: true,
+            maxTokensField: "max_tokens",
+            requiresToolResultName: false,
+            requiresAssistantAfterToolResult: false,
+            requiresThinkingAsText: false,
+            requiresMistralToolIds: false,
+            thinkingFormat: "openai",
+            supportsStrictMode: false,
+            openRouterRouting: undefined,
+        },
+    };
+}
+/**
+ * Resolve a model ID to a pi-ai Model object.
+ *
+ * Supports:
+ *   - "ollama/deepseek-coder-v2" → Ollama local model
+ *   - "openrouter/auto" → OpenRouter cloud model
+ *   - "claude-sonnet-4-6" → standard pi-ai model lookup
+ *   - Falls back to any available provider's default model
+ */
+export function resolveModel(modelId, warnFn) {
+    // Ollama models — create synthetic model
+    if (modelId.startsWith("ollama/")) {
+        return { model: createOllamaModel(modelId), provider: "ollama" };
+    }
+    // OpenRouter models — create synthetic model
+    if (modelId.startsWith("openrouter/")) {
+        return { model: createOpenRouterModel(modelId), provider: "openrouter" };
+    }
+    // Standard pi-ai model lookup
+    const knownProviders = new Set(Object.keys(PROVIDER_KEYS));
+    let model;
+    let resolvedProvider = "";
+    // Try known providers with API keys first
+    for (const provider of getProviders()) {
+        if (!knownProviders.has(provider))
+            continue;
+        const key = PROVIDER_KEYS[provider];
+        if (!process.env[key])
+            continue;
+        for (const m of getModels(provider)) {
+            if (m.id === modelId) {
+                model = m;
+                resolvedProvider = provider;
+                break;
+            }
+        }
+        if (model)
+            break;
+    }
+    // Try unknown providers
+    if (!model) {
+        for (const provider of getProviders()) {
+            if (knownProviders.has(provider))
+                continue;
+            for (const m of getModels(provider)) {
+                if (m.id === modelId) {
+                    model = m;
+                    resolvedProvider = provider;
+                    break;
+                }
+            }
+            if (model)
+                break;
+        }
+    }
+    // Fallback: try default model for any provider that has a key
+    if (!model) {
+        for (const [prov, envKey] of Object.entries(PROVIDER_KEYS)) {
+            if (!process.env[envKey])
+                continue;
+            const fallbackId = DEFAULT_MODELS[prov];
+            if (!fallbackId)
+                continue;
+            for (const p of getProviders()) {
+                if (p !== prov)
+                    continue;
+                for (const m of getModels(p)) {
+                    if (m.id === fallbackId) {
+                        model = m;
+                        resolvedProvider = prov;
+                        if (warnFn)
+                            warnFn(`Using ${fallbackId} (${prov}) — model "${modelId}" not found`);
+                        break;
+                    }
+                }
+                if (model)
+                    break;
+            }
+            if (model)
+                break;
+        }
+    }
+    if (!model)
+        return null;
+    return { model, provider: resolvedProvider };
+}
+//# sourceMappingURL=model-resolver.js.map

package/dist/swarm.js

@@ -14,7 +14,7 @@ import "./env.js";
 import * as fs from "node:fs";
 import * as path from "node:path";
 // Dynamic imports — ensures env.js has set process.env BEFORE pi-ai loads
-const { getModels, getProviders } = await import("@mariozechner/pi-ai");
+await import("@mariozechner/pi-ai");
 const { PythonRepl } = await import("./core/repl.js");
 const { runRlmLoop } = await import("./core/rlm.js");
 const { loadConfig } = await import("./config.js");
@@ -25,9 +25,11 @@ await import("./agents/claude-code.js");
 await import("./agents/codex.js");
 await import("./agents/aider.js");
 import { randomBytes } from "node:crypto";
+// Api/Model types used via resolveModel from model-resolver
 import { loadHooks, runHooks } from "./hooks/runner.js";
 import { EpisodicMemory } from "./memory/episodic.js";
 import { buildSwarmSystemPrompt } from "./prompts/orchestrator.js";
+import { resolveModel } from "./routing/model-resolver.js";
 import { classifyTaskComplexity, describeAvailableAgents, FailureTracker, routeTask } from "./routing/model-router.js";
 import { ThreadManager } from "./threads/manager.js";
 import { renderBanner } from "./ui/banner.js";
@@ -218,81 +220,6 @@ function scanDirectory(dir, maxFiles = 200, maxTotalSize = 2 * 1024 * 1024) {
     }
     return parts.join("\n");
 }
-// ── Model resolution ────────────────────────────────────────────────────────
-function resolveModel(modelId) {
-    const providerKeys = {
-        anthropic: "ANTHROPIC_API_KEY",
-        openai: "OPENAI_API_KEY",
-        google: "GEMINI_API_KEY",
-    };
-    const defaultModels = {
-        anthropic: "claude-sonnet-4-6",
-        openai: "gpt-4o",
-        google: "gemini-2.5-flash",
-    };
-    const knownProviders = new Set(Object.keys(providerKeys));
-    let model;
-    let resolvedProvider = "";
-    for (const provider of getProviders()) {
-        if (!knownProviders.has(provider))
-            continue;
-        const key = providerKeys[provider];
-        if (!process.env[key])
-            continue;
-        for (const m of getModels(provider)) {
-            if (m.id === modelId) {
-                model = m;
-                resolvedProvider = provider;
-                break;
-            }
-        }
-        if (model)
-            break;
-    }
-    if (!model) {
-        for (const provider of getProviders()) {
-            if (knownProviders.has(provider))
-                continue;
-            for (const m of getModels(provider)) {
-                if (m.id === modelId) {
-                    model = m;
-                    resolvedProvider = provider;
-                    break;
-                }
-            }
-            if (model)
-                break;
-        }
-    }
-    if (!model) {
-        for (const [prov, envKey] of Object.entries(providerKeys)) {
-            if (!process.env[envKey])
-                continue;
-            const fallbackId = defaultModels[prov];
-            if (!fallbackId)
-                continue;
-            for (const p of getProviders()) {
-                if (p !== prov)
-                    continue;
-                for (const m of getModels(p)) {
-                    if (m.id === fallbackId) {
-                        model = m;
-                        resolvedProvider = prov;
-                        logWarn(`Using ${fallbackId} (${prov}) — model "${modelId}" not found`);
-                        break;
-                    }
-                }
-                if (model)
-                    break;
-            }
-            if (model)
-                break;
-        }
-    }
-    if (!model)
-        return null;
-    return { model, provider: resolvedProvider };
-}
 // ── Main ────────────────────────────────────────────────────────────────────
 export async function runSwarmMode(rawArgs) {
     const args = parseSwarmArgs(rawArgs);
@@ -319,10 +246,16 @@ export async function runSwarmMode(rawArgs) {
         config.max_session_budget_usd = args.maxBudget;
     if (args.autoRoute)
         config.auto_model_selection = true;
-    // Resolve orchestrator model
-    const resolved = resolveModel(args.orchestratorModel);
+    // Resolve orchestrator model — prefer CLI arg, then config's default_model
+    const orchestratorModelId = args.orchestratorModel !== "claude-sonnet-4-6"
+        ? args.orchestratorModel
+        : config.default_model || args.orchestratorModel;
+    const modelLookupId = orchestratorModelId.startsWith("ollama/") || orchestratorModelId.startsWith("openrouter/")
+        ? orchestratorModelId
+        : orchestratorModelId.replace(/^(anthropic|openai|google)\//, "");
+    const resolved = resolveModel(modelLookupId, logWarn);
     if (!resolved) {
-        logError(`Could not find model "${args.orchestratorModel}"`, "Set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GEMINI_API_KEY in your .env file");
+        logError(`Could not find model "${orchestratorModelId}"`, "Set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GEMINI_API_KEY in your .env file, or use Ollama/OpenRouter");
         process.exit(1);
     }
     // Initialize episodic memory if enabled

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarm-code",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Open-source swarm-native coding agent orchestrator — spawns parallel coding agents in isolated git worktrees, built on RLM (arXiv:2512.24601)",
   "type": "module",
   "bin": {