Skip backup inference sources that fail to build

A leftover Ollama Custom URL with an extra path threw while building
sibling sources, so a healthy head provider could not start. Skip
per-ref build failures in the backup list and still fail when the
active provider cannot build.

Author: TheGreatAxios

src/config/inference-sources.ts

@@ -178,7 +178,14 @@ export function buildSourcesFromRefs(
   const out: InferenceSource[] = [];
   const seenIds = new Set<string>();
   for (const ref of refs) {
-    const src = buildInferenceSourceForRef(ref, ctx, settings);
+    let src: InferenceSource | null;
+    try {
+      src = buildInferenceSourceForRef(ref, ctx, settings);
+    } catch {
+      // A leftover sibling URL (e.g. Custom `/api/tags`) must not take down the
+      // whole bundle. Head failure is re-checked in `buildSourceBundle`.
+      continue;
+    }
     if (src === null) continue;
     if (seenIds.has(src.id)) continue;
     seenIds.add(src.id);
@@ -215,17 +222,22 @@ function buildSourceBundle(args: {
 
   const sources = buildSourcesFromRefs(refs, ctx, args.settings);
   const defaultId = args.head.provider;
-  if (sources.length === 0) {
-    const fallback = buildInferenceSourceForRef(args.head, ctx, args.settings);
+  const hasDefault = sources.some((s) => s.id === defaultId);
+  if (!hasDefault) {
+    let fallback: InferenceSource | null;
+    try {
+      fallback = buildInferenceSourceForRef(args.head, ctx, args.settings);
+    } catch (error) {
+      throw new Error(`No inference source for provider "${defaultId}"`, { cause: error });
+    }
     if (fallback === null) {
       throw new Error(`No inference source for provider "${defaultId}"`);
     }
-    return { sources: [fallback], defaultSource: fallback.id };
+    return { sources: [fallback, ...sources], defaultSource: fallback.id };
   }
-  const hasDefault = sources.some((s) => s.id === defaultId);
   return {
     sources,
-    defaultSource: hasDefault ? defaultId : (sources[0]?.id ?? defaultId),
+    defaultSource: defaultId,
   };
 }
 

src/provider/ollama.test.ts

@@ -41,6 +41,12 @@ describe("ollamaOpenAIBaseURL", () => {
     expect(() => ollamaOpenAIBaseURL("http://localhost:11434/team")).toThrow(
       "expected a server root without a path",
     );
+    expect(() => ollamaOpenAIBaseURL("http://localhost:11434/api/tags")).toThrow(
+      "expected a server root without a path",
+    );
+    expect(() => normalizeOllamaRootURL("http://localhost:11434/api/tags")).toThrow(
+      "expected a server root without a path",
+    );
   });
 });
 

tests/unit/inference-sources.test.ts

@@ -141,6 +141,84 @@ test("buildMainSessionSources backs the active head with other configured provid
   expect(bundle.defaultSource).toBe("openai");
 });
 
+test("ollama backup with leftover extra path does not throw when OpenAI is active", () => {
+  const leftoverURL = "http://localhost:11434/api/tags";
+  const settings: Settings = {
+    providers: {
+      openai: {
+        baseURL: "https://api.openai.com/v1",
+        apiKey: "k",
+        models: ["gpt-4o"],
+      },
+      ollama: { baseURL: leftoverURL, keyless: true, models: ["llama3"] },
+    },
+  };
+  const mixedCatalog: ProviderCatalogEntry[] = [
+    {
+      name: "openai",
+      baseURL: "https://api.openai.com/v1",
+      apiKey: "k",
+      models: ["gpt-4o"],
+      defaultModel: "gpt-4o",
+    },
+    {
+      name: "ollama",
+      baseURL: leftoverURL,
+      keyless: true,
+      models: ["llama3"],
+      defaultModel: "llama3",
+    },
+  ];
+  const bundle = buildMainSessionSources({
+    settings,
+    catalog: mixedCatalog,
+    activeProvider: "openai",
+    activeModel: "gpt-4o",
+    sessionId: "sess",
+  });
+  expect(bundle.defaultSource).toBe("openai");
+  expect(bundle.sources.map((s) => s.id)).toEqual(["openai"]);
+});
+
+test("active ollama with leftover extra path still fails that provider", () => {
+  const leftoverURL = "http://localhost:11434/api/tags";
+  const settings: Settings = {
+    providers: {
+      ollama: { baseURL: leftoverURL, keyless: true, models: ["llama3"] },
+      openai: {
+        baseURL: "https://api.openai.com/v1",
+        apiKey: "k",
+        models: ["gpt-4o"],
+      },
+    },
+  };
+  const mixedCatalog: ProviderCatalogEntry[] = [
+    {
+      name: "ollama",
+      baseURL: leftoverURL,
+      keyless: true,
+      models: ["llama3"],
+      defaultModel: "llama3",
+    },
+    {
+      name: "openai",
+      baseURL: "https://api.openai.com/v1",
+      apiKey: "k",
+      models: ["gpt-4o"],
+      defaultModel: "gpt-4o",
+    },
+  ];
+  expect(() =>
+    buildMainSessionSources({
+      settings,
+      catalog: mixedCatalog,
+      activeProvider: "ollama",
+      activeModel: "llama3",
+      sessionId: "sess",
+    }),
+  ).toThrow('No inference source for provider "ollama"');
+});
+
 test("legacy ollama /v1 backup does not throw when OpenAI is active", () => {
   const settings: Settings = {
     providers: {