fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astro-Han merged 1 commit into from
Jul 13, 2026
Merged

fix: preserve Ollama Cloud aliases without auth #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
const ollama = connection({
slug: 'ollama-local',
providerType: 'ollama',
defaultModel: 'qwen3.5:cloud',
models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
modelSource: 'fetched',
modelsFetchedAt: 1_800_000_000_000,
});

assert.deepEqual(
buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
connectionSlug,
providerType,
model,
})),
[
{ connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
{ connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
],
);
assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
llmConnectionSlug: 'ollama-local',
model: 'qwen3.5:cloud',
});
});

it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/provider-registry.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
| {
kind: 'openai-compatible';
name: 'provider' | 'connection';
apiKeyFallback?: string;
passFetch?: boolean;
requireBaseUrl?: boolean;
}
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
status: 'ready',
protocol: 'openai',
runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
modelDiscovery: { kind: 'ollama' },
category: 'local',
catalogGroup: 'local',
Expand Down
64 changes: 34 additions & 30 deletions packages/headless/src/__tests__/harbor-task-runner.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
});
});

test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
await withRun(async ({ jobsDir, repo }) => {
let harborEnv: Record<string, string> | undefined;
const captured: { config?: Record<string, unknown> } = {};
const baseUrl = 'http://127.0.0.1:11434/v1';
const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
const runner = createHarborTaskRunner({
makaRepoPath: repo,
jobsDir,
model: `ollama/${model}`,
provider: 'ollama',
agentEnv: { MAKA_BASE_URL: baseUrl },
runHarbor: async (request) => {
harborEnv = request.env;
return fakeRunner({ reward: '1\n', captured })(request);
},
for (const model of [
'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
'qwen3.5:cloud',
]) {
test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
await withRun(async ({ jobsDir, repo }) => {
let harborEnv: Record<string, string> | undefined;
const captured: { config?: Record<string, unknown> } = {};
const baseUrl = 'http://127.0.0.1:11434/v1';
const runner = createHarborTaskRunner({
makaRepoPath: repo,
jobsDir,
model: `ollama/${model}`,
provider: 'ollama',
agentEnv: { MAKA_BASE_URL: baseUrl },
runHarbor: async (request) => {
harborEnv = request.env;
return fakeRunner({ reward: '1\n', captured })(request);
},
});

await runner(runInput());

assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
assert.equal(agent.model_name, model);
assert.equal(agent.env.MAKA_MODEL, model);
assert.equal(agent.env.MAKA_BASE_URL, undefined);
assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
});

await runner(runInput());

assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
assert.equal(agent.model_name, model);
assert.equal(agent.env.MAKA_MODEL, model);
assert.equal(agent.env.MAKA_BASE_URL, undefined);
assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
});
});
}

test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down
195 changes: 108 additions & 87 deletions packages/runtime/src/__tests__/provider-conformance.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
assert.equal(result.text, 'Echoed hello.');
});

test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
const requestBodies: Array<Record<string, unknown>> = [];
const server = await startJsonServer(async (request, response) => {
if (request.method === 'GET' && request.url === '/api/tags') {
assert.equal(request.headers.authorization, undefined);
respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
return;
}
assert.equal(request.method, 'POST');
assert.equal(request.url, '/v1/chat/completions');
assert.equal(request.headers.authorization, 'Bearer ollama');
const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
requestBodies.push(body);
if (requestBodies.length === 1) {
respondJson(response, 200, {
id: 'chatcmpl-ollama-tool',
object: 'chat.completion',
created: 1,
model: modelId,
choices: [{
index: 0,
message: {
role: 'assistant',
content: null,
tool_calls: [{
id: 'call_echo',
type: 'function',
function: { name: 'echo', arguments: '{"text":"hello"}' },
}],
},
finish_reason: 'tool_calls',
}],
usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
});
return;
}
respondJson(response, 200, {
id: 'chatcmpl-ollama-final',
object: 'chat.completion',
created: 2,
model: modelId,
choices: [{
index: 0,
message: { role: 'assistant', content: 'Echoed hello.' },
finish_reason: 'stop',
}],
usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
});
for (const testCase of [
{
label: 'complex local model id',
discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
},
{
label: 'cloud alias distinct from its local model id',
discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
modelId: 'qwen3.5:cloud',
},
] as const) {
test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
});
const connection: LlmConnection = {
slug: 'ollama-local',
name: 'Ollama',
providerType: 'ollama',
baseUrl: `${server.url}/v1`,
defaultModel: modelId,
enabled: true,
createdAt: 1,
updatedAt: 1,
};

assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

const result = await generateText({
model: getAIModel({ connection, apiKey: '', modelId }),
prompt: 'Call echo with hello, then report the result.',
tools: {
echo: tool({
description: 'Echo text',
inputSchema: z.object({ text: z.string() }),
execute: async ({ text }) => ({ text }),
}),
},
stopWhen: stepCountIs(2),
});

assert.equal(result.text, 'Echoed hello.');
assert.equal(requestBodies.length, 2);
assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
assert.deepEqual(
(requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
['echo'],
);
const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
const toolMessage = secondMessages.find((message) => message.role === 'tool');
assert.ok(toolMessage);
assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
});
}

test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
});
});

async function assertOllamaModelContract(
discoveredModelIds: readonly string[],
modelId: string,
): Promise<void> {
const requestBodies: Array<Record<string, unknown>> = [];
const server = await startJsonServer(async (request, response) => {
if (request.method === 'GET' && request.url === '/api/tags') {
assert.equal(request.headers.authorization, undefined);
respondJson(response, 200, {
models: discoveredModelIds.map((id) => ({ name: id, model: id })),
});
return;
}
assert.equal(request.method, 'POST');
assert.equal(request.url, '/v1/chat/completions');
assert.equal(request.headers.authorization, undefined);
const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
requestBodies.push(body);
if (requestBodies.length === 1) {
respondJson(response, 200, {
id: 'chatcmpl-ollama-tool',
object: 'chat.completion',
created: 1,
model: modelId,
choices: [{
index: 0,
message: {
role: 'assistant',
content: null,
tool_calls: [{
id: 'call_echo',
type: 'function',
function: { name: 'echo', arguments: '{"text":"hello"}' },
}],
},
finish_reason: 'tool_calls',
}],
usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
});
return;
}
respondJson(response, 200, {
id: 'chatcmpl-ollama-final',
object: 'chat.completion',
created: 2,
model: modelId,
choices: [{
index: 0,
message: { role: 'assistant', content: 'Echoed hello.' },
finish_reason: 'stop',
}],
usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
});
});
const connection: LlmConnection = {
slug: 'ollama-local',
name: 'Ollama',
providerType: 'ollama',
baseUrl: `${server.url}/v1`,
defaultModel: modelId,
enabled: true,
createdAt: 1,
updatedAt: 1,
};

assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

const result = await generateText({
model: getAIModel({ connection, apiKey: '', modelId }),
prompt: 'Call echo with hello, then report the result.',
tools: {
echo: tool({
description: 'Echo text',
inputSchema: z.object({ text: z.string() }),
execute: async ({ text }) => ({ text }),
}),
},
stopWhen: stepCountIs(2),
});

assert.equal(result.text, 'Echoed hello.');
assert.equal(requestBodies.length, 2);
assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
assert.deepEqual(
(requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
['echo'],
);
const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
const toolMessage = secondMessages.find((message) => message.role === 'tool');
assert.ok(toolMessage);
assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/src/model-factory.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
return createOpenAICompatible({
name,
apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
apiKey,
baseURL,
...(adapter.passFetch ? { fetch } : {}),
}).chatModel(modelId);
Expand Down
35 changes: 35 additions & 0 deletions packages/storage/src/__tests__/connection-store.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
await withConnectionStore(async (store, dir) => {
const localModelId = 'qwen3.5';
const cloudModelId = 'qwen3.5:cloud';
const created = await store.create({
slug: 'ollama-local',
name: 'Ollama',
providerType: 'ollama',
defaultModel: localModelId,
});

await store.update(created.slug, {
defaultModel: cloudModelId,
models: [{ id: localModelId }, { id: cloudModelId }],
modelSource: 'fetched',
modelsFetchedAt: 1_800_000_000_000,
});

const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
connections: Array<{
providerType: string;
defaultModel: string;
models: Array<{ id: string }>;
modelSource: string;
modelsFetchedAt: number;
}>;
};
assert.equal(persisted.connections[0]?.providerType, 'ollama');
assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
assert.equal(persisted.connections[0]?.modelSource, 'fetched');
assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
});
});

test('persists the Fireworks provider id and exact model path', async () => {
await withConnectionStore(async (store, dir) => {
await store.create({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: preserve Ollama Cloud aliases without auth#907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Astro-Han
merged 1 commit into

from

Jul 13, 2026
 Merged


fix: preserve Ollama Cloud aliases without auth
#907
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


28 changes: 28 additions & 0 deletions
apps/desktop/src/main/__tests__/model-catalog-choices.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,34 @@ function connection(overrides: Partial<LlmConnection> & Pick<LlmConnection, 'slu
}

describe('model catalog picker helpers', () => {
 it('keeps an Ollama cloud alias distinct and selects it unchanged', async () => {
 const { buildCatalogChatModelChoices, pickCatalogDefaultChatModel } = await importModelCatalogChoices();
 const ollama = connection({
 slug: 'ollama-local',
 providerType: 'ollama',
 defaultModel: 'qwen3.5:cloud',
 models: [{ id: 'qwen3.5' }, { id: 'qwen3.5:cloud' }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 assert.deepEqual(
 buildCatalogChatModelChoices([ollama]).map(({ connectionSlug, providerType, model }) => ({
 connectionSlug,
 providerType,
 model,
 })),
 [
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5' },
 { connectionSlug: 'ollama-local', providerType: 'ollama', model: 'qwen3.5:cloud' },
 ],
 );
 assert.deepEqual(pickCatalogDefaultChatModel(ollama), {
 llmConnectionSlug: 'ollama-local',
 model: 'qwen3.5:cloud',
 });
 });

 it('keeps Chat choices on send-wired providers and filters unsupported Codex ChatGPT models', async () => {
 const { buildCatalogChatModelChoices } = await importModelCatalogChoices();

Expand Down

3 changes: 1 addition & 2 deletions
packages/core/src/provider-registry.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@ export type ProviderRuntimeAdapter =
 | {
 kind: 'openai-compatible';
 name: 'provider' | 'connection';
 apiKeyFallback?: string;
 passFetch?: boolean;
 requireBaseUrl?: boolean;
 }
Expand DownExpand Up@@ -590,7 +589,7 @@ const providerRegistry = {
 fallbackModels: ['llama3.2', 'qwen2.5-coder', 'gemma3'],
 status: 'ready',
 protocol: 'openai',
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider', apiKeyFallback: 'ollama' },
 runtimeAdapter: { kind: 'openai-compatible', name: 'provider' },
 modelDiscovery: { kind: 'ollama' },
 category: 'local',
 catalogGroup: 'local',
Expand Down

64 changes: 34 additions & 30 deletions
packages/headless/src/__tests__/harbor-task-runner.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -307,38 +307,42 @@ describe('createHarborTaskRunner', () => {
 });
 });

 test('routes no-auth Ollama through the host-side cell without exposing credentials', async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const model = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 for (const model of [
 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 'qwen3.5:cloud',
 ]) {
 test(`routes no-auth Ollama model ${model} through the host-side cell without exposing credentials`, async () => {
 await withRun(async ({ jobsDir, repo }) => {
 let harborEnv: Record<string, string> | undefined;
 const captured: { config?: Record<string, unknown> } = {};
 const baseUrl = 'http://127.0.0.1:11434/v1';
 const runner = createHarborTaskRunner({
 makaRepoPath: repo,
 jobsDir,
 model: `ollama/${model}`,
 provider: 'ollama',
 agentEnv: { MAKA_BASE_URL: baseUrl },
 runHarbor: async (request) => {
 harborEnv = request.env;
 return fakeRunner({ reward: '1\n', captured })(request);
 },
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });

 await runner(runInput());

 assert.equal(harborEnv?.MAKA_HOST_REPO_ROOT, repo);
 assert.equal(harborEnv?.MAKA_HOST_BASE_URL, baseUrl);
 assert.equal(harborEnv?.MAKA_HOST_NO_AUTH, 'true');
 assert.equal(harborEnv?.MAKA_HOST_API_KEY, undefined);
 assert.equal(harborEnv?.MAKA_HOST_API_KEY_FILE, undefined);
 const agent = (captured.config?.agents as Array<{ model_name: string; env: Record<string, string> }>)[0]!;
 assert.equal(agent.model_name, model);
 assert.equal(agent.env.MAKA_MODEL, model);
 assert.equal(agent.env.MAKA_BASE_URL, undefined);
 assert.doesNotMatch(JSON.stringify(captured.config), /API_KEY|127\.0\.0\.1:11434/);
 });
 });
 }

 test('rejects provider secrets in agentEnv even when host-side key file is configured', async () => {
 await withRun(async ({ jobsDir, repo, keyFile }) => {
Expand Down

195 changes: 108 additions & 87 deletions
packages/runtime/src/__tests__/provider-conformance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -793,94 +793,22 @@ describe('models.dev provider conformance', () => {
 assert.equal(result.text, 'Echoed hello.');
 });

 test('Ollama discovers an exact local model id and completes a no-secret tool-call loop', async () => {
 const modelId = 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M';
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, { models: [{ name: modelId, model: modelId }] });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, 'Bearer ollama');
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 for (const testCase of [
 {
 label: 'complex local model id',
 discoveredModelIds: ['hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M'],
 modelId: 'hf.co/bartowski/Qwen2.5-Coder-7B-Instruct-GGUF:Q4_K_M',
 },
 {
 label: 'cloud alias distinct from its local model id',
 discoveredModelIds: ['qwen3.5', 'qwen3.5:cloud'],
 modelId: 'qwen3.5:cloud',
 },
 ] as const) {
 test(`Ollama preserves an exact ${testCase.label} through local discovery and a no-secret tool-call loop`, async () => {
 await assertOllamaModelContract(testCase.discoveredModelIds, testCase.modelId);
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), [{ id: modelId }]);

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
 });
 }

 test('Mistral discovers exact account model ids and completes its documented tool-call loop', async () => {
 const requestBodies: Array<Record<string, unknown>> = [];
Expand DownExpand Up@@ -1306,6 +1234,99 @@ describe('models.dev provider conformance', () => {
 });
});

async function assertOllamaModelContract(
 discoveredModelIds: readonly string[],
 modelId: string,
): Promise<void> {
 const requestBodies: Array<Record<string, unknown>> = [];
 const server = await startJsonServer(async (request, response) => {
 if (request.method === 'GET' && request.url === '/api/tags') {
 assert.equal(request.headers.authorization, undefined);
 respondJson(response, 200, {
 models: discoveredModelIds.map((id) => ({ name: id, model: id })),
 });
 return;
 }
 assert.equal(request.method, 'POST');
 assert.equal(request.url, '/v1/chat/completions');
 assert.equal(request.headers.authorization, undefined);
 const body = JSON.parse(await readBody(request)) as Record<string, unknown>;
 requestBodies.push(body);
 if (requestBodies.length === 1) {
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-tool',
 object: 'chat.completion',
 created: 1,
 model: modelId,
 choices: [{
 index: 0,
 message: {
 role: 'assistant',
 content: null,
 tool_calls: [{
 id: 'call_echo',
 type: 'function',
 function: { name: 'echo', arguments: '{"text":"hello"}' },
 }],
 },
 finish_reason: 'tool_calls',
 }],
 usage: { prompt_tokens: 8, completion_tokens: 4, total_tokens: 12 },
 });
 return;
 }
 respondJson(response, 200, {
 id: 'chatcmpl-ollama-final',
 object: 'chat.completion',
 created: 2,
 model: modelId,
 choices: [{
 index: 0,
 message: { role: 'assistant', content: 'Echoed hello.' },
 finish_reason: 'stop',
 }],
 usage: { prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 },
 });
 });
 const connection: LlmConnection = {
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 baseUrl: `${server.url}/v1`,
 defaultModel: modelId,
 enabled: true,
 createdAt: 1,
 updatedAt: 1,
 };

 assert.deepEqual(await fetchProviderModels(connection, ''), discoveredModelIds.map((id) => ({ id })));

 const result = await generateText({
 model: getAIModel({ connection, apiKey: '', modelId }),
 prompt: 'Call echo with hello, then report the result.',
 tools: {
 echo: tool({
 description: 'Echo text',
 inputSchema: z.object({ text: z.string() }),
 execute: async ({ text }) => ({ text }),
 }),
 },
 stopWhen: stepCountIs(2),
 });

 assert.equal(result.text, 'Echoed hello.');
 assert.equal(requestBodies.length, 2);
 assert.deepEqual(requestBodies.map((body) => body.model), [modelId, modelId]);
 assert.deepEqual(
 (requestBodies[0]?.tools as Array<{ function: { name: string } }>).map((entry) => entry.function.name),
 ['echo'],
 );
 const secondMessages = requestBodies[1]?.messages as Array<{ role: string; content: string }>;
 const toolMessage = secondMessages.find((message) => message.role === 'tool');
 assert.ok(toolMessage);
 assert.deepEqual(JSON.parse(toolMessage.content), { text: 'hello' });
}

async function startJsonServer(
 handler: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>,
): Promise<{ url: string; close(): Promise<void> }> {
Expand Down

2 changes: 1 addition & 1 deletion
packages/runtime/src/model-factory.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ export function getAIModel(input: ModelFactoryInput): LanguageModelV3 {
 const name = adapter.name === 'connection' ? connection.slug : connection.providerType;
 return createOpenAICompatible({
 name,
 apiKey: adapter.apiKeyFallback ? apiKey || adapter.apiKeyFallback : apiKey,
 apiKey,
 baseURL,
 ...(adapter.passFetch ? { fetch } : {}),
 }).chatModel(modelId);
Expand Down

35 changes: 35 additions & 0 deletions
packages/storage/src/__tests__/connection-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,41 @@ import { PROVIDER_DEFAULTS } from '@maka/core/llm-connections';
import { createConnectionStore } from '../connection-store.js';

describe('FileConnectionStore', () => {
 test('persists the Ollama provider and exact cloud alias in discovery and selection state', async () => {
 await withConnectionStore(async (store, dir) => {
 const localModelId = 'qwen3.5';
 const cloudModelId = 'qwen3.5:cloud';
 const created = await store.create({
 slug: 'ollama-local',
 name: 'Ollama',
 providerType: 'ollama',
 defaultModel: localModelId,
 });

 await store.update(created.slug, {
 defaultModel: cloudModelId,
 models: [{ id: localModelId }, { id: cloudModelId }],
 modelSource: 'fetched',
 modelsFetchedAt: 1_800_000_000_000,
 });

 const persisted = JSON.parse(await readFile(join(dir, 'llm-connections.json'), 'utf8')) as {
 connections: Array<{
 providerType: string;
 defaultModel: string;
 models: Array<{ id: string }>;
 modelSource: string;
 modelsFetchedAt: number;
 }>;
 };
 assert.equal(persisted.connections[0]?.providerType, 'ollama');
 assert.equal(persisted.connections[0]?.defaultModel, cloudModelId);
 assert.deepEqual(persisted.connections[0]?.models, [{ id: localModelId }, { id: cloudModelId }]);
 assert.equal(persisted.connections[0]?.modelSource, 'fetched');
 assert.equal(persisted.connections[0]?.modelsFetchedAt, 1_800_000_000_000);
 });
 });

 test('persists the Fireworks provider id and exact model path', async () => {
 await withConnectionStore(async (store, dir) => {
 await store.create({
Expand Down
Loading