Merge pull request #173 from codedogQBY/fix/ai-endpoint-missing-protocol

fix(ai): auto-prepend http(s):// to scheme-less base URLs (#170)

Author: codedogQBY

packages/core/src/ai/test-endpoint.ts

@@ -106,7 +106,31 @@ async function fetchJson(
       contentType: response.headers.get("content-type"),
     });
   }
-  return response.json();
+  const rawBody = await response.text();
+  try {
+    return JSON.parse(rawBody);
+  } catch {
+    const contentType = response.headers.get("content-type") || "";
+    if (debug) {
+      logAIEndpointDebug("error", debug.endpoint, {
+        action: debug.action,
+        method: init?.method || "GET",
+        requestUrl: url,
+        model: debug.model,
+        status: response.status,
+        statusText: response.statusText,
+        contentType,
+        responseLength: rawBody.length,
+        responseBodyPreview: summarizeDebugText(rawBody),
+      });
+    }
+    const lookedLikeHtml = /^\s*<(!doctype|html)/i.test(rawBody) || contentType.includes("html");
+    throw new Error(
+      lookedLikeHtml
+        ? `Endpoint returned an HTML page instead of JSON (${url}). Make sure the base URL starts with http:// or https:// and points to the API root.`
+        : `Endpoint did not return JSON (${url}). Make sure the base URL starts with http:// or https:// and points to the API root.`,
+    );
+  }
 }
 
 async function listOpenAICompatibleModels(endpoint: AIEndpoint): Promise<string[]> {

packages/core/src/stores/settings-store.ts

@@ -147,18 +147,22 @@ async function fetchOpenAIModels(endpoint: AIEndpoint): Promise<string[]> {
   try {
     data = JSON.parse(rawBody);
   } catch {
+    const contentType = response.headers.get("content-type") || "";
     logAIEndpointDebug("error", endpoint, {
       action: "fetch-models",
       method: "GET",
       requestUrl,
       status: response.status,
       statusText: response.statusText,
-      contentType: response.headers.get("content-type"),
+      contentType,
       responseLength: rawBody.length,
       responseBodyPreview: summarizeDebugText(rawBody),
     });
+    const lookedLikeHtml = /^\s*<(!doctype|html)/i.test(rawBody) || contentType.includes("html");
     throw new Error(
-      "The endpoint did not return JSON. Check whether the base URL points to the API root instead of a console page.",
+      lookedLikeHtml
+        ? "The endpoint returned an HTML page instead of JSON. Make sure the base URL starts with http:// or https:// and points to the API root, not a console/dashboard page."
+        : "The endpoint did not return JSON. Make sure the base URL starts with http:// or https:// and points to the API root, not a console page.",
     );
   }
 

packages/core/src/utils/api.test.ts

@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
 import {
   buildOpenAICompatibleUrl,
   buildProviderModelsUrl,
+  ensureUrlProtocol,
+  formatApiHost,
   providerSupportsExactRequestUrl,
   resolveProviderBaseUrl,
 } from "./api";
@@ -80,4 +82,45 @@ describe("AI API URL helpers", () => {
       buildProviderModelsUrl("google", "https://generativelanguage.googleapis.com", "AIza-test"),
     ).toBe("https://generativelanguage.googleapis.com/v1beta/models?key=AIza-test");
   });
+
+  describe("ensureUrlProtocol / scheme-less inputs", () => {
+    it("prepends https:// when a remote URL has no scheme", () => {
+      expect(ensureUrlProtocol("api.openai.com/v1")).toBe("https://api.openai.com/v1");
+      expect(ensureUrlProtocol("openrouter.ai/api/v1")).toBe("https://openrouter.ai/api/v1");
+    });
+
+    it("prepends http:// for localhost / loopback hosts", () => {
+      expect(ensureUrlProtocol("localhost:11434")).toBe("http://localhost:11434");
+      expect(ensureUrlProtocol("127.0.0.1:8080/api")).toBe("http://127.0.0.1:8080/api");
+    });
+
+    it("leaves already-protocoled URLs alone", () => {
+      expect(ensureUrlProtocol("https://api.openai.com")).toBe("https://api.openai.com");
+      expect(ensureUrlProtocol("http://localhost:1234")).toBe("http://localhost:1234");
+      expect(ensureUrlProtocol("  https://api.openai.com  ")).toBe("https://api.openai.com");
+    });
+
+    it("returns empty string for empty / whitespace input", () => {
+      expect(ensureUrlProtocol("")).toBe("");
+      expect(ensureUrlProtocol("   ")).toBe("");
+    });
+
+    it("strips leading slashes that would survive concatenation", () => {
+      expect(ensureUrlProtocol("//api.example.com")).toBe("//api.example.com");
+      expect(ensureUrlProtocol("/api.example.com")).toBe("https://api.example.com");
+    });
+
+    it("flows through the provider URL builders so requests escape the webview", () => {
+      expect(resolveProviderBaseUrl("openai", "api.openai.com")).toBe(
+        "https://api.openai.com/v1",
+      );
+      expect(buildProviderModelsUrl("custom", "api.example.com")).toBe(
+        "https://api.example.com/v1/models",
+      );
+      expect(buildProviderModelsUrl("ollama", "localhost:11434")).toBe(
+        "http://localhost:11434/api/tags",
+      );
+      expect(formatApiHost("api.openai.com")).toBe("https://api.openai.com/v1/");
+    });
+  });
 });

packages/core/src/utils/api.ts

@@ -214,7 +214,7 @@ const VERSION_PATTERN = /\/(v[1-9]\d*|api\/v[1-9]\d*|api\/paas\/v[1-9]\d*|compat
 export function formatApiHost(host: string): string {
   if (!host) return host;
 
-  host = host.trim();
+  host = ensureUrlProtocol(host.trim());
 
   if (host.endsWith("/")) {
     return host;
@@ -237,6 +237,24 @@ export function trimApiUrl(url: string): string {
   return url.replace(/\/+$/, "");
 }
 
+/**
+ * If the URL has no scheme, prepend https:// (or http:// for localhost / loopback).
+ * Without this, scheme-less inputs like "api.openai.com/v1" get resolved by the
+ * Tauri webview as relative paths against tauri://localhost and fall through to
+ * the SPA's own index.html, producing the confusing "Unexpected token '<'" /
+ * "endpoint did not return JSON" error chain on connect.
+ */
+export function ensureUrlProtocol(url: string): string {
+  const trimmed = url.trim();
+  if (!trimmed) return trimmed;
+  if (/^[a-z][a-z0-9+\-.]*:\/\//i.test(trimmed)) return trimmed;
+  if (trimmed.startsWith("//")) return trimmed;
+  const stripped = trimmed.replace(/^\/+/, "");
+  const isLoopback =
+    /^(localhost(?:[:/]|$)|127\.\d+\.\d+\.\d+|0\.0\.0\.0(?:[:/]|$)|\[::1?\])/i.test(stripped);
+  return `${isLoopback ? "http://" : "https://"}${stripped}`;
+}
+
 function sanitizeOpenAICompatibleBaseUrl(url: string): string {
   const trimmed = trimApiUrl(url);
 
@@ -271,7 +289,7 @@ export function resolveProviderBaseUrl(
   baseUrl?: string,
   exactRequestUrl = false,
 ): string {
-  const rawBaseUrl = (baseUrl || getDefaultBaseUrl(providerId) || "").trim();
+  const rawBaseUrl = ensureUrlProtocol((baseUrl || getDefaultBaseUrl(providerId) || "").trim());
   if (!rawBaseUrl) return "";
   const providerConfig = getProviderConfig(providerId);
   const trimmedRawBaseUrl = trimApiUrl(rawBaseUrl);
@@ -298,7 +316,7 @@ export function buildProviderModelsUrl(
   apiKey?: string,
   exactRequestUrl = false,
 ): string {
-  const rawBaseUrl = (baseUrl || getDefaultBaseUrl(providerId) || "").trim();
+  const rawBaseUrl = ensureUrlProtocol((baseUrl || getDefaultBaseUrl(providerId) || "").trim());
   if (!rawBaseUrl) return "";
 
   if (exactRequestUrl && providerSupportsExactRequestUrl(providerId)) {

packages/core/src/utils/index.ts

@@ -29,6 +29,7 @@ export type { TimeGroup, GroupedThreads } from "./time-group";
 export {
   formatApiHost,
   trimApiUrl,
+  ensureUrlProtocol,
   providerSupportsExactRequestUrl,
   resolveProviderBaseUrl,
   buildProviderModelsUrl,