@spinabot/brigade 1.19.4 → 1.20.0

package/dist/integrations/ollama.d.ts

@@ -9,12 +9,9 @@
  * via the `~/.brigade/models.json` mechanism Pi exposes for custom providers.
  * Each model the user has pulled becomes a Pi `Model<"openai-completions">`.
  *
- * Capability detection is AUTHORITATIVE where possible: Ollama's POST /api/show
- * returns a `capabilities` array (e.g. ["completion","tools","thinking","vision"])
- * that tells us directly whether a model REASONS, supports TOOLS, and accepts
- * IMAGES. We read that first and only fall back to name-pattern guessing when the
- * probe is unavailable (older daemon / offline). Context window still isn't
- * reported, so that stays a safe default.
+ * Capability inference is best-effort — Ollama doesn't tell us a model's
+ * context window or whether it reasons. We pattern-match the model name
+ * against well-known families and fall back to safe defaults.
  */
 export interface OllamaModelSummary {
     id: string;
@@ -41,30 +38,17 @@ export interface InferredCapabilities {
     input: ("text" | "image")[];
 }
 export declare function inferOllamaModelCapabilities(modelId: string): InferredCapabilities;
-/** What `/api/show` tells us about a model — all best-effort / nullable. */
-export interface OllamaModelInfo {
-    /** Lower-cased capability tags, or null when the probe failed. */
-    capabilities: string[] | null;
-    /** The model's real max context window (tokens), or null when unknown. */
-    contextLength: number | null;
-}
-/**
- * AUTHORITATIVE model probe — POST /api/show for one model and return its
- * capabilities (`"thinking"`/`"tools"`/`"vision"`) AND its real context window.
- * This is the source of truth — far better than guessing from the model name.
- * Best-effort: any failure (older Ollama, daemon down, timeout) yields nulls so
- * callers fall back to `inferOllamaModelCapabilities`.
- */
-export declare function fetchOllamaModelInfo(modelId: string, baseUrl?: string): Promise<OllamaModelInfo>;
-/** Back-compat helper — capability tags only. Prefer `fetchOllamaModelInfo`. */
-export declare function fetchOllamaCapabilities(modelId: string, baseUrl?: string): Promise<string[] | null>;
 /**
- * Write Brigade's Ollama provider entry into Pi's `~/.brigade/models.json`.
- * Pi's `ModelRegistry.refresh()` picks this up and exposes the models as
- * regular Pi models from then on.
+ * Write Brigade's Ollama provider entry into Pi's `~/.brigade/models.json` as a
+ * NATIVE provider — `api:"ollama"` (dispatched to our /api/chat transport) with
+ * the base URL (no `/v1`). Pi's `ModelRegistry.refresh()` picks this up and
+ * exposes the models as regular Pi models from then on.
  *
- * We MERGE rather than overwrite — the user (or other providers) may have
- * existing entries in the file we shouldn't clobber.
+ * Other providers' entries in the file are left untouched (we only rewrite the
+ * `ollama` key). Within the `ollama` entry, discovery OWNS the model list +
+ * capabilities (they're re-derived every run), but an operator-set real apiKey
+ * and custom headers are PRESERVED across the rewrite — only the keyless sentinel
+ * is replaced.
  */
 export declare function writeOllamaToModelsJson(modelsJsonPath: string, baseUrl: string, models: OllamaModelSummary[]): Promise<void>;
 /**
@@ -74,14 +58,23 @@ export declare function writeOllamaToModelsJson(modelsJsonPath: string, baseUrl:
  *
  * Called when the model registry MISSES an `ollama/<model>` id: the user has
  * almost certainly `ollama pull`ed a model since onboarding. We re-query the
- * local daemon, merge the full catalog into models.json (capability inference
- * + zero cost + the OpenAI-compatible provider routing), and report whether the
- * requested model now exists. Best-effort: never throws — on any failure
- * (daemon down, no models) it returns `false` and the caller surfaces the
- * normal "not registered" guidance.
+ * local daemon, merge the full catalog into models.json (native `api:"ollama"`
+ * routing + capability inference + zero cost), and return the CANONICAL catalog
+ * id of the requested model (or `null` if it isn't installed). Best-effort:
+ * never throws — on any failure (daemon down, no models) it returns `null` and
+ * the caller surfaces the normal "not registered" guidance.
  *
- * The caller is responsible for `modelRegistry.refresh()` + re-`find()` after
- * this resolves true, so Pi picks up the freshly-written entries.
+ * The caller is responsible for `modelRegistry.refresh()` + re-`find()` with the
+ * returned canonical id after this resolves non-null, so Pi picks up the
+ * freshly-written entries.
+ */
+export declare function rediscoverOllamaModel(modelsJsonPath: string, modelId: string, baseUrl?: string): Promise<string | null>;
+/**
+ * One-time migration: rewrite a pre-existing OpenAI-compat Ollama provider entry
+ * (`api:"openai-completions"` + a `/v1` base URL) to the native shape
+ * (`api:"ollama"`, base URL without `/v1`). Idempotent + best-effort — existing
+ * users would otherwise stay silently on the degraded `/v1` path (no reliable
+ * native tool_calls) until they re-onboarded. Returns true when it rewrote.
  */
-export declare function rediscoverOllamaModel(modelsJsonPath: string, modelId: string, baseUrl?: string): Promise<boolean>;
+export declare function migrateOllamaProviderToNative(modelsJsonPath: string): Promise<boolean>;
 //# sourceMappingURL=ollama.d.ts.map

package/dist/integrations/ollama.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../src/integrations/ollama.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAwBH,MAAM,WAAW,kBAAkB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,GAAE,MAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAqC5G;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;CAC5B;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAiDlF;AAWD,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC/B,kEAAkE;IAClE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,0EAA0E;IAC1E,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAcD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAyB,GAChC,OAAO,CAAC,eAAe,CAAC,CAsB1B;AAED,gFAAgF;AAChF,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAyB,GAChC,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAE1B;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC5C,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAkEf;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAC1C,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAyB,GAChC,OAAO,CAAC,OAAO,CAAC,CAclB"}
+{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../src/integrations/ollama.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAoDH,MAAM,WAAW,kBAAkB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,GAAE,MAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA+C5G;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;CAC5B;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAgElF;AA6DD;;;;;;;;;;;GAWG;AACH,wBAAsB,uBAAuB,CAC5C,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAqFf;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CAC1C,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAAyB,GAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkCxB;AAED;;;;;;GAMG;AACH,wBAAsB,6BAA6B,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiC5F"}

package/dist/integrations/ollama.js

@@ -9,24 +9,58 @@
  * via the `~/.brigade/models.json` mechanism Pi exposes for custom providers.
  * Each model the user has pulled becomes a Pi `Model<"openai-completions">`.
  *
- * Capability detection is AUTHORITATIVE where possible: Ollama's POST /api/show
- * returns a `capabilities` array (e.g. ["completion","tools","thinking","vision"])
- * that tells us directly whether a model REASONS, supports TOOLS, and accepts
- * IMAGES. We read that first and only fall back to name-pattern guessing when the
- * probe is unavailable (older daemon / offline). Context window still isn't
- * reported, so that stays a safe default.
+ * Capability inference is best-effort — Ollama doesn't tell us a model's
+ * context window or whether it reasons. We pattern-match the model name
+ * against well-known families and fall back to safe defaults.
  */
 import * as fs from "node:fs/promises";
 import path from "node:path";
 import { tryGetRuntimeContext } from "../storage/runtime-context.js";
-const DEFAULT_BASE_URL = "http://localhost:11434";
+import { classifyUrlForSsrf } from "../infra/net/fetch-guard.js";
+// 127.0.0.1, not "localhost": on IPv6-preferring hosts "localhost" resolves to
+// ::1 while Ollama binds IPv4 → ECONNREFUSED. Use the explicit v4 loopback.
+const DEFAULT_BASE_URL = "http://127.0.0.1:11434";
 const TIMEOUT_MS = 5000;
+// Placeholder apiKeys Brigade writes for keyless local Ollama. Treated as "no
+// real credential" so a re-discovery rewrite doesn't mistake a sentinel for an
+// operator-set key worth preserving. Kept in sync with the stream transport's set.
+const OLLAMA_SENTINEL_API_KEYS = new Set([
+    "ollama-local-no-auth-required",
+    "ollama-local",
+    "ollama",
+]);
+// Cap simultaneous /api/show probes so a box with many pulled models doesn't
+// fire dozens of concurrent requests (which stalls onboarding/rediscovery).
+const SHOW_PROBE_CONCURRENCY = 8;
+/** Map over items with a bounded worker pool (results keyed by input index). */
+async function mapWithConcurrency(items, limit, fn) {
+    const results = new Array(items.length);
+    let next = 0;
+    const worker = async () => {
+        while (next < items.length) {
+            const idx = next++;
+            results[idx] = await fn(items[idx]);
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(Math.max(1, limit), items.length || 1) }, worker));
+    return results;
+}
 /**
  * Hit Ollama's `/api/tags` and return the user's locally-installed models.
  * Throws a friendly error if the server isn't running or returns no models.
  */
 export async function discoverOllamaModels(baseUrl = DEFAULT_BASE_URL) {
-    const url = `${baseUrl.replace(/\/$/, "")}/api/tags`;
+    // Strip a trailing `/v1` (someone may pass the OpenAI-compat endpoint) + any
+    // trailing slashes, matching fetchOllamaModelInfo + writeOllamaToModelsJson —
+    // `/api/tags` is a native path, so `.../v1/api/tags` would 404.
+    const url = `${baseUrl.replace(/\/+$/, "").replace(/\/v1$/i, "")}/api/tags`;
+    // SSRF guard on the config-driven base URL. allowPrivateNetwork lets local /
+    // LAN Ollama through; only genuinely dangerous targets (cloud-metadata /
+    // link-local) are refused — no real Ollama listens there.
+    const ssrfReason = await classifyUrlForSsrf(url, { allowPrivateNetwork: true });
+    if (ssrfReason) {
+        throw new Error(`That Ollama server address isn't allowed (${ssrfReason}). Point it at your local or network Ollama.`);
+    }
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), TIMEOUT_MS);
     let response;
@@ -73,14 +107,29 @@ export function inferOllamaModelCapabilities(modelId) {
     //   - `qwen3.5*`     — base chat, not the reasoning fork
     // Originally `^qwen3\b` matched all of these and triggered the bug.
     //
-    // Reasoning patterns that ARE safe to mark:
-    //   - `deepseek-r1*`  — explicit r1 (reasoning) line
-    //   - `qwq*`          — Qwen with Questions (reasoning fork)
-    //   - `*-thinking*`   — explicit thinking variant naming convention
-    //   - `o1*` / `o3*`   — OpenAI o-series via Ollama (rare)
+    // Reasoning patterns that ARE safe to mark (dedicated reasoning models — they
+    // return STRUCTURED tool_calls + native `thinking` even with thinking on, so
+    // no prose-narration risk; anchored so they can't catch a tool-caller sibling):
+    //   - `deepseek-r1*`      — explicit r1 (reasoning) line
+    //   - `qwq*`              — Qwen with Questions (reasoning fork)
+    //   - `*-thinking*`       — explicit thinking variant naming convention
+    //   - `gpt-oss*`          — OpenAI open-weight reasoning (harmony format)
+    //   - `magistral*`        — Mistral's reasoning model (`^magistral` ≠ `mistral*`)
+    //   - `phi4*-reasoning*`  — Phi-4 reasoning variants (bare `phi4` stays non-reasoning)
+    //   - `exaone-deep*`      — LG EXAONE Deep reasoning line (`exaone3.5` excluded)
+    //   - `smallthinker*`     — SmallThinker ("thinker" ≠ "thinking", so anchored)
+    //   - `o1*` / `o3*`       — OpenAI o-series via Ollama (rare)
+    // Deliberately EXCLUDED (hybrid think/non-think, default non-reasoning, strong
+    // tool-callers): `qwen3`, `cogito`, `deepseek-v3.1` — forcing thinking on risks
+    // the prose-narration bug with no automatic net. Opt in via /thinking instead.
     const reasoning = /^deepseek-r1\b/.test(id) ||
         /^qwq\b/.test(id) ||
         /-thinking\b/.test(id) ||
+        /^gpt-oss\b/.test(id) ||
+        /^magistral\b/.test(id) ||
+        /^phi4(?:-mini)?-reasoning\b/.test(id) ||
+        /^exaone-deep\b/.test(id) ||
+        /^smallthinker\b/.test(id) ||
         /\bo1\b/.test(id) ||
         /\bo3\b/.test(id);
     // Vision-capable families — text+image input.
@@ -101,62 +150,68 @@ export function inferOllamaModelCapabilities(modelId) {
     const input = vision ? ["text", "image"] : ["text"];
     return { reasoning, contextWindow, maxTokens, input };
 }
-/** Pull `<arch>.context_length` out of `/api/show`'s `model_info` (the key is
- *  architecture-prefixed, e.g. `qwen3.context_length`). */
-function extractContextLength(modelInfo) {
-    if (!modelInfo || typeof modelInfo !== "object")
-        return null;
-    for (const [k, v] of Object.entries(modelInfo)) {
-        if (k.endsWith(".context_length") && typeof v === "number" && Number.isFinite(v) && v > 0) {
-            return Math.floor(v);
-        }
-    }
-    return null;
-}
 /**
- * AUTHORITATIVE model probe — POST /api/show for one model and return its
- * capabilities (`"thinking"`/`"tools"`/`"vision"`) AND its real context window.
- * This is the source of truth — far better than guessing from the model name.
- * Best-effort: any failure (older Ollama, daemon down, timeout) yields nulls so
- * callers fall back to `inferOllamaModelCapabilities`.
+ * Best-effort per-model probe of Ollama's `/api/show`. Returns whether the model
+ * accepts images (`vision` capability) and its real trained context window
+ * (`<arch>.context_length`). Any failure yields nulls so the caller falls back
+ * to the name-heuristic. NOTE: we deliberately do NOT derive `reasoning` from
+ * the `thinking` capability — defaulting local models to thinking-on turns them
+ * into narrators that emit tool intent as prose instead of structured calls, so
+ * reasoning stays name-heuristic (thinking off by default; opt in via /thinking).
  */
-export async function fetchOllamaModelInfo(modelId, baseUrl = DEFAULT_BASE_URL) {
-    const url = `${baseUrl.replace(/\/$/, "")}/api/show`;
+async function fetchOllamaModelInfo(modelId, baseUrl = DEFAULT_BASE_URL) {
+    const url = `${baseUrl.replace(/\/+$/, "").replace(/\/v1$/i, "")}/api/show`;
+    // SSRF guard (same config-driven base URL as the turn traffic). Best-effort
+    // probe: on a blocked target, fall back to the name-heuristic rather than throw.
+    if (await classifyUrlForSsrf(url, { allowPrivateNetwork: true })) {
+        return { vision: null, contextLength: null };
+    }
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), TIMEOUT_MS);
     try {
         const res = await fetch(url, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ model: modelId }),
+            // Send both keys — modern Ollama reads `model`; older builds read `name`.
+            body: JSON.stringify({ model: modelId, name: modelId }),
             signal: controller.signal,
         });
         if (!res.ok)
-            return { capabilities: null, contextLength: null };
+            return { vision: null, contextLength: null };
         const body = (await res.json());
-        const capabilities = Array.isArray(body.capabilities)
+        const caps = Array.isArray(body.capabilities)
             ? body.capabilities.map((c) => String(c).toLowerCase())
             : null;
-        return { capabilities, contextLength: extractContextLength(body.model_info) };
+        const vision = caps ? caps.includes("vision") : null;
+        let contextLength = null;
+        if (body.model_info && typeof body.model_info === "object") {
+            for (const [k, v] of Object.entries(body.model_info)) {
+                if (k.endsWith(".context_length") && typeof v === "number" && Number.isFinite(v) && v > 0) {
+                    contextLength = Math.floor(v);
+                    break;
+                }
+            }
+        }
+        return { vision, contextLength };
     }
     catch {
-        return { capabilities: null, contextLength: null };
+        return { vision: null, contextLength: null };
     }
     finally {
         clearTimeout(timer);
     }
 }
-/** Back-compat helper — capability tags only. Prefer `fetchOllamaModelInfo`. */
-export async function fetchOllamaCapabilities(modelId, baseUrl = DEFAULT_BASE_URL) {
-    return (await fetchOllamaModelInfo(modelId, baseUrl)).capabilities;
-}
 /**
- * Write Brigade's Ollama provider entry into Pi's `~/.brigade/models.json`.
- * Pi's `ModelRegistry.refresh()` picks this up and exposes the models as
- * regular Pi models from then on.
+ * Write Brigade's Ollama provider entry into Pi's `~/.brigade/models.json` as a
+ * NATIVE provider — `api:"ollama"` (dispatched to our /api/chat transport) with
+ * the base URL (no `/v1`). Pi's `ModelRegistry.refresh()` picks this up and
+ * exposes the models as regular Pi models from then on.
  *
- * We MERGE rather than overwrite — the user (or other providers) may have
- * existing entries in the file we shouldn't clobber.
+ * Other providers' entries in the file are left untouched (we only rewrite the
+ * `ollama` key). Within the `ollama` entry, discovery OWNS the model list +
+ * capabilities (they're re-derived every run), but an operator-set real apiKey
+ * and custom headers are PRESERVED across the rewrite — only the keyless sentinel
+ * is replaced.
  */
 export async function writeOllamaToModelsJson(modelsJsonPath, baseUrl, models) {
     let existing = { providers: {} };
@@ -169,36 +224,51 @@ export async function writeOllamaToModelsJson(modelsJsonPath, baseUrl, models) {
     catch {
         // File missing or unparseable — start fresh. Pi treats an absent file as no config.
     }
-    // Prefer Ollama's own /api/show `capabilities` (authoritative for reasoning /
-    // tools / vision); fall back to the name heuristic only when the probe fails.
-    // Probes run in parallel, so total added latency is ~one request, not N.
-    const modelDefs = await Promise.all(models.map(async (m) => {
-        const guess = inferOllamaModelCapabilities(m.id);
+    // Native transport: base URL WITHOUT /v1 (Brigade registers api:"ollama" → /api/chat).
+    const nativeBaseUrl = baseUrl.replace(/\/+$/, "").replace(/\/v1$/i, "");
+    // Probe /api/show for real vision + context (bounded concurrency, best-effort);
+    // fall back to the name-heuristic when unreachable. Reasoning stays name-heuristic.
+    const modelDefs = await mapWithConcurrency(models, SHOW_PROBE_CONCURRENCY, async (m) => {
+        const caps = inferOllamaModelCapabilities(m.id);
         const info = await fetchOllamaModelInfo(m.id, baseUrl);
-        const caps = info.capabilities;
-        const reasoning = caps ? caps.includes("thinking") : guess.reasoning;
-        const vision = caps ? caps.includes("vision") : guess.input.includes("image");
+        const vision = info.vision ?? caps.input.includes("image");
         const input = vision ? ["text", "image"] : ["text"];
-        // Prefer the model's REAL context window from /api/show; the name-based
-        // guess (32k) is only a fallback. This value also drives the runtime
-        // num_ctx we inject, so an accurate number prevents silent truncation.
-        const contextWindow = info.contextLength ?? guess.contextWindow;
+        const contextWindow = info.contextLength ?? caps.contextWindow;
         return {
             id: m.id,
             name: m.name + (m.parameterSize ? ` (${m.parameterSize})` : ""),
-            reasoning,
+            reasoning: caps.reasoning,
             input,
             contextWindow,
-            maxTokens: guess.maxTokens,
+            maxTokens: caps.maxTokens,
             cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, // local = free
+            // Per-model baseUrl (belt-and-suspenders): the native stream reads
+            // model.baseUrl, so carry it on each model in case Pi's registry doesn't
+            // propagate the provider baseUrl onto registry-loaded models.
+            baseUrl: nativeBaseUrl,
         };
-    }));
+    });
+    // Preserve operator-set auth across a re-discovery rewrite: a remote/authed
+    // Ollama proxy may carry a REAL apiKey and/or custom headers under this entry.
+    // Discovery owns the model LIST, but must not silently wipe credentials — only
+    // fall back to the sentinel when no real key was set.
+    const prevOllama = existing.providers["ollama"];
+    const prevApiKey = typeof prevOllama?.apiKey === "string" && !OLLAMA_SENTINEL_API_KEYS.has(prevOllama.apiKey)
+        ? prevOllama.apiKey
+        : undefined;
+    const prevHeaders = prevOllama?.headers && typeof prevOllama.headers === "object" && !Array.isArray(prevOllama.headers)
+        ? prevOllama.headers
+        : undefined;
     existing.providers["ollama"] = {
-        baseUrl: `${baseUrl.replace(/\/$/, "")}/v1`,
-        api: "openai-completions",
-        // Ollama ignores the API key but Pi requires apiKey to be set when defining
-        // custom models for non-built-in providers. Use a sentinel value.
-        apiKey: "ollama-local-no-auth-required",
+        // Native transport: base URL WITHOUT /v1; Brigade registers api:"ollama"
+        // (→ /api/chat) so tool-calls + thinking come back structured.
+        baseUrl: nativeBaseUrl,
+        api: "ollama",
+        // Ollama (local) ignores the API key, but Pi requires apiKey to be set when
+        // defining custom models for a non-built-in provider. Preserve a real
+        // operator key if one was set; otherwise use a sentinel value.
+        apiKey: prevApiKey ?? "ollama-local-no-auth-required",
+        ...(prevHeaders ? { headers: prevHeaders } : {}),
         models: modelDefs,
     };
     // In convex mode resolveModelsPath routes to the OS cache dir, which may
@@ -228,14 +298,15 @@ export async function writeOllamaToModelsJson(modelsJsonPath, baseUrl, models) {
  *
  * Called when the model registry MISSES an `ollama/<model>` id: the user has
  * almost certainly `ollama pull`ed a model since onboarding. We re-query the
- * local daemon, merge the full catalog into models.json (capability inference
- * + zero cost + the OpenAI-compatible provider routing), and report whether the
- * requested model now exists. Best-effort: never throws — on any failure
- * (daemon down, no models) it returns `false` and the caller surfaces the
- * normal "not registered" guidance.
+ * local daemon, merge the full catalog into models.json (native `api:"ollama"`
+ * routing + capability inference + zero cost), and return the CANONICAL catalog
+ * id of the requested model (or `null` if it isn't installed). Best-effort:
+ * never throws — on any failure (daemon down, no models) it returns `null` and
+ * the caller surfaces the normal "not registered" guidance.
  *
- * The caller is responsible for `modelRegistry.refresh()` + re-`find()` after
- * this resolves true, so Pi picks up the freshly-written entries.
+ * The caller is responsible for `modelRegistry.refresh()` + re-`find()` with the
+ * returned canonical id after this resolves non-null, so Pi picks up the
+ * freshly-written entries.
  */
 export async function rediscoverOllamaModel(modelsJsonPath, modelId, baseUrl = DEFAULT_BASE_URL) {
     let discovered;
@@ -245,13 +316,77 @@ export async function rediscoverOllamaModel(modelsJsonPath, modelId, baseUrl = D
     catch {
         // Daemon unreachable / no models — let the caller surface the standard
         // guidance (run `ollama pull`, check the daemon is up).
-        return false;
+        return null;
     }
     if (discovered.length === 0)
+        return null;
+    // Honor the "never throws" contract: writeOllamaToModelsJson can throw on an fs
+    // error (EACCES/ENOSPC/read-only cache dir). Swallow it → null so the caller
+    // surfaces the standard "not registered" guidance instead of an opaque reject.
+    try {
+        await writeOllamaToModelsJson(modelsJsonPath, baseUrl, discovered);
+    }
+    catch {
+        return null;
+    }
+    // Return the CANONICAL catalog id that matched, so the caller re-finds the
+    // EXACT id Pi registered (Pi's find is an exact id match — NOT tolerant). We
+    // match on id OR name, tolerating a leading `ollama/` provider prefix AND a
+    // missing `:latest` tag: a composed ref (`ollama/llama3.2`) or a tag-less id
+    // (`qwen3` when only `qwen3:latest` is installed) must resolve to the real
+    // catalog id, else it's a hard "model not registered" (Ollama has no synth
+    // fallback) EVEN THOUGH the model is pulled + in the catalog.
+    const wanted = modelId.trim().replace(/^ollama\//i, "");
+    const match = discovered.find((m) => m.id === wanted ||
+        m.name === wanted ||
+        m.id === `${wanted}:latest` ||
+        m.name === `${wanted}:latest`);
+    return match ? match.id : null;
+}
+/**
+ * One-time migration: rewrite a pre-existing OpenAI-compat Ollama provider entry
+ * (`api:"openai-completions"` + a `/v1` base URL) to the native shape
+ * (`api:"ollama"`, base URL without `/v1`). Idempotent + best-effort — existing
+ * users would otherwise stay silently on the degraded `/v1` path (no reliable
+ * native tool_calls) until they re-onboarded. Returns true when it rewrote.
+ */
+export async function migrateOllamaProviderToNative(modelsJsonPath) {
+    let parsed;
+    try {
+        parsed = JSON.parse(await fs.readFile(modelsJsonPath, "utf8"));
+    }
+    catch {
+        return false; // no/invalid file → nothing to migrate
+    }
+    const entry = parsed.providers?.ollama;
+    if (!entry)
+        return false;
+    const baseUrl = typeof entry.baseUrl === "string" ? entry.baseUrl : "";
+    const needsMigration = entry.api !== "ollama" || /\/v1\/?$/i.test(baseUrl);
+    if (!needsMigration)
         return false;
-    await writeOllamaToModelsJson(modelsJsonPath, baseUrl, discovered);
-    // Match on id OR name — `/api/tags` reports both, and the user may have
-    // typed either form when picking the model.
-    return discovered.some((m) => m.id === modelId || m.name === modelId);
+    entry.api = "ollama";
+    if (baseUrl)
+        entry.baseUrl = baseUrl.replace(/\/+$/, "").replace(/\/v1$/i, "");
+    try {
+        await fs.writeFile(modelsJsonPath, JSON.stringify(parsed, null, 2), "utf8");
+    }
+    catch {
+        return false;
+    }
+    // Convex mode: the file above is the regenerable OS-cache mirror; the DURABLE
+    // copy is the sealed "models" blob. Push the migrated catalog there too, or the
+    // migration fixes only the cache and the next boot re-materialises the stale
+    // blob (openai-completions/v1) — migration would silently re-run forever and
+    // never persist. Mirrors writeOllamaToModelsJson's blob push.
+    const rctx = tryGetRuntimeContext();
+    if (rctx?.mode === "convex") {
+        await rctx.store.auth
+            .writeAuthFileBlob("main", "models", parsed)
+            .catch((err) => {
+            console.error(`brigade: models catalog migrate→convex failed — ${err.message}`);
+        });
+    }
+    return true;
 }
 //# sourceMappingURL=ollama.js.map

package/dist/integrations/ollama.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/integrations/ollama.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/integrations/ollama.ts"],"names":[],"mappings":"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"}

package/dist/providers/catalog.js

@@ -173,7 +173,7 @@ export const PROVIDERS = [
         envVar: "", // no env key
         noAuth: true,
         local: true,
-        baseUrl: "http://localhost:11434",
+        baseUrl: "http://127.0.0.1:11434",
     },
     {
         id: "custom",

package/dist/providers/validate-key.js

@@ -32,7 +32,7 @@ function buildRequest(providerId, apiKey) {
         case "ollama":
             // Ollama runs locally; `/api/tags` is auth-free and lists installed models.
             return {
-                url: "http://localhost:11434/api/tags",
+                url: "http://127.0.0.1:11434/api/tags",
                 init: { method: "GET" },
             };
         case "anthropic": {

package/dist/system-prompt/guidance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guidance.d.ts","sourceRoot":"","sources":["../../src/system-prompt/guidance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,kVAI0K,CAAC;AAEjN;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAYT;AAID;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,uBAAuB,+bAM4E,CAAC;AAIjH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,u7EAU4I,CAAC;AAIhL;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,6pDAU0D,CAAC;AAIvF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,quDAY4G,CAAC;AAIzI;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,qyJA+CmK,CAAC;AAInM;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,cAAc,+nDAQiU,CAAC;AAI7V;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,wnGAUsP,CAAC;AAIrR;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,kxNA6CoF,CAAC;AAIrH;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,+/BAS4E,CAAC;AAIrH;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CA2BlF"}
+{"version":3,"file":"guidance.d.ts","sourceRoot":"","sources":["../../src/system-prompt/guidance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,kVAI0K,CAAC;AAEjN;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAYT;AAID;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,uBAAuB,+bAM4E,CAAC;AAIjH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,u7EAU4I,CAAC;AAIhL;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,6pDAU0D,CAAC;AAIvF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,quDAY4G,CAAC;AAIzI;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,qyJA+CmK,CAAC;AAInM;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,cAAc,+nDAQiU,CAAC;AAI7V;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,wnGAUsP,CAAC;AAIrR;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,kxNA6CoF,CAAC;AAIrH;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,+/BAS4E,CAAC;AAIrH;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAuBlF"}

package/dist/system-prompt/guidance.js

@@ -386,16 +386,9 @@ export function pickModelFamilyGuidance(modelId) {
     // Anthropic family — already follows the patterns the system prompt teaches.
     if (/(?:^|\/)claude(?:\d|[-_.:]|$)/.test(id))
         return null;
-    // Unknown / niche — every OTHER model (local Ollama forks: ornith, llama,
-    // qwen, deepseek, mistral, phi, …) previously fell through to NO override and
-    // happily answered "I'm Claude" / "I'm Ornith, powered by OpenAI and
-    // Anthropic". Give them the generic identity anchor so the base model's
-    // training identity never leaks.
-    return GENERIC_IDENTITY_GUIDANCE;
+    // Unknown / niche — fall through to no extra guidance.
+    return null;
 }
-const GENERIC_IDENTITY_GUIDANCE = `# Identity override
-
-You are the assistant defined by the persona files above — you run inside Brigade. The underlying language model is only the engine; it is NOT your identity. When asked who or what you are, answer from the persona files. Never identify as the base model or its vendor — never say you are "Claude", "GPT", "ChatGPT", "Gemini", "Gemma", "Llama", "Qwen", "DeepSeek", "Ornith", "an OpenAI / Anthropic / Google model", "an open-source coding assistant", or "a large language model". If the persona files don't specify a name, call yourself Brigade.`;
 const OPENAI_FAMILY_GUIDANCE = `# Identity override (OpenAI family)
 
 Your baseline training tells you to identify as "ChatGPT", "GPT", "an AI assistant from OpenAI", "your coding assistant", "an AI coding assistant", or to identify with the project in your working directory. None of that applies here. When asked who you are, draw your identity from the persona files above — never say "I am ChatGPT" / "I'm GPT" / "I'm an AI coding assistant" / "I'm here to help you with this codebase".

package/dist/system-prompt/guidance.js.map

@@ -1 +1 @@
-{"version":3,"file":"guidance.js","sourceRoot":"","sources":["../../src/system-prompt/guidance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"guidance.js","sourceRoot":"","sources":["../../src/system-prompt/guidance.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinabot/brigade",
-  "version": "1.19.4",
+  "version": "1.20.0",
   "description": "Brigade — your personal AI crew",
   "homepage": "https://brigade.spinabot.com",
   "author": "Spinabot <hello@brigade-agent.ai>",
@@ -248,7 +248,10 @@
     },
     "exceljs": {
       "uuid": "^11.1.1"
-    }
+    },
+    "@earendil-works/pi-ai": "0.79.9",
+    "@earendil-works/pi-agent-core": "0.79.9",
+    "@earendil-works/pi-tui": "0.79.9"
   },
   "keywords": [
     "ai",