Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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" + '
refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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('^' + ".*" + ' refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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('^' + ".*" + ' refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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" + ' refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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('^' + ".*" + ' refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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('^' + ".*" + ' refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
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); } })(); })(); refactor(desktop): enforce a metadata-free renderer startup boundary by Colafornia · Pull Request #2176 · apache/maka · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
165 changes: 85 additions & 80 deletions apps/desktop/src/main/__tests__/model-catalog-choices.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,48 +5,22 @@ import { dirname, resolve } from 'node:path';
import { pathToFileURL } from 'node:url';
import { describe, it } from 'node:test';
import { build } from 'esbuild';
import type { LlmConnection } from '@maka/core';
import type { ChatModelChoice, LlmConnection, SessionSummary } from '@maka/core';
import { buildChatModelChoices } from '@maka/core/chat-model-choice';
import { buildConnectionModelCatalogEntries } from '@maka/core/model-catalog';
import {
normalizeActiveChatModel,
pickNewChatModel,
} from '../../renderer/shell-chat-model-selection.js';

const REPO_ROOT = resolve(import.meta.dirname, '../../../../..');

type ModelCatalogChoicesModule = {
buildCatalogRecommendedDefaultModel(providerType: LlmConnection['providerType']): string;
buildCatalogChatModelChoices(connections: readonly LlmConnection[]): Array<{
connectionSlug: string;
providerType: string;
model: string;
label: string;
connectionName?: string;
}>;
pickCatalogDefaultChatModel(connection: LlmConnection):
| { llmConnectionSlug: string; model: string }
| undefined;
pickNewChatModel(input: {
pending: { llmConnectionSlug: string; model: string } | null;
activationCandidate?: { llmConnectionSlug: string; model: string };
catalogDefault: { llmConnectionSlug: string; model: string } | undefined;
choices: Array<{
connectionSlug: string;
providerType: LlmConnection['providerType'];
model: string;
label: string;
}>;
}): { llmConnectionSlug: string; model: string } | undefined;
buildCatalogDailyReviewModelOptions(
connections: readonly LlmConnection[],
currentModelKey: string,
): Array<readonly [string, string]>;
buildCatalogModelChoices(connection: LlmConnection): Array<{
id: string;
displayName?: string;
source: string;
recommendedRank?: number;
lifecycle: string;
docsUrl?: string;
availability: string;
unavailableReason: string;
isDefault: boolean;
}>;
};

let modulePromise: Promise<ModelCatalogChoicesModule> | undefined;
Expand DownExpand Up@@ -92,8 +66,57 @@ function choiceIdentity(choice: {
}

describe('model catalog picker helpers', () => {
it('uses the first offered model when no user or workspace preference exists', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('keeps the first offered Codex model when replacing an unsupported stored model', () => {
const choices: ChatModelChoice[] = [
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'first-offered',
label: 'First offered',
isDefault: false,
thinkingLevels: [],
},
{
connectionSlug: 'codex-account',
providerType: 'openai-codex',
providerLabel: 'OpenAI OAuth',
model: 'later-default',
label: 'Later default',
isDefault: true,
thinkingLevels: [],
},
];
const session: SessionSummary = {
id: 'session-1',
name: 'Legacy Codex session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'codex-account',
connectionLocked: true,
model: 'gpt-5-codex',
permissionMode: 'ask',
};

assert.equal(
normalizeActiveChatModel(
session,
connection({
slug: 'codex-account',
providerType: 'openai-codex',
defaultModel: 'gpt-5-codex',
}),
choices,
),
'first-offered',
);
});

it('uses the first offered model when no user or workspace preference exists', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -102,17 +125,19 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'opencode-free',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'mimo-v2.5-free',
label: 'MiMo V2.5 Free',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'opencode-free', model: 'mimo-v2.5-free' },
);
});

it('uses the readiness-checked activation candidate before an unverified first choice', async () => {
const { pickNewChatModel } = await importModelCatalogChoices();
it('uses the readiness-checked activation candidate before an unverified first choice', () => {
assert.deepEqual(
pickNewChatModel({
pending: null,
Expand All@@ -125,24 +150,29 @@ describe('model catalog picker helpers', () => {
{
connectionSlug: 'missing-key-first',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'unusable-model',
label: 'Unusable',
isDefault: true,
thinkingLevels: [],
},
{
connectionSlug: 'ready-second',
providerType: 'opencode-free',
providerLabel: 'OpenCode Zen',
model: 'ready-model',
label: 'Ready',
isDefault: true,
thinkingLevels: [],
},
],
}),
{ llmConnectionSlug: 'ready-second', model: 'ready-model' },
);
});

it('offers the normalized fallback for legacy Codex-only inventory', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('offers the normalized fallback for legacy Codex-only inventory', () => {
const choices = buildChatModelChoices([
connection({
slug: 'codex-account',
providerType: 'openai-codex',
Expand All@@ -157,9 +187,7 @@ describe('model catalog picker helpers', () => {
]);
});

it('projects enabled models across wired providers without collapsing provider identities', async () => {
const { buildCatalogChatModelChoices, buildCatalogModelChoices } =
await importModelCatalogChoices();
it('projects enabled models across wired providers without collapsing provider identities', () => {
const openrouter = connection({
slug: 'openrouter-main',
providerType: 'openrouter',
Expand All@@ -173,15 +201,15 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogChatModelChoices([openrouter]).map((choice) => choice.model),
buildChatModelChoices([openrouter]).map((choice) => choice.model),
['openrouter/auto', 'anthropic/claude-sonnet-4.6'],
);
assert.deepEqual(
buildCatalogModelChoices(openrouter).map((choice) => choice.id),
buildConnectionModelCatalogEntries({ connection: openrouter }).map((choice) => choice.id),
['openrouter/auto', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.5'],
);

const choices = buildCatalogChatModelChoices([
const choices = buildChatModelChoices([
connection({
slug: 'ollama-cloud',
providerType: 'ollama-cloud',
Expand DownExpand Up@@ -231,9 +259,8 @@ describe('model catalog picker helpers', () => {
]);
});

it('keeps API connection labels while redacting OAuth account identities', async () => {
const { buildCatalogChatModelChoices } = await importModelCatalogChoices();
const choices = buildCatalogChatModelChoices([
it('keeps API connection labels while redacting OAuth account identities', () => {
const choices = buildChatModelChoices([
connection({
slug: 'openrouter',
name: 'Openrouter',
Expand DownExpand Up@@ -351,12 +378,7 @@ describe('model catalog picker helpers', () => {
});

it('derives canonical defaults, exact provider ids, and missing-default state', async () => {
const {
buildCatalogChatModelChoices,
buildCatalogModelChoices,
buildCatalogRecommendedDefaultModel,
pickCatalogDefaultChatModel,
} = await importModelCatalogChoices();
const { buildCatalogRecommendedDefaultModel } = await importModelCatalogChoices();
assert.deepEqual(
[
'deepseek',
Expand DownExpand Up@@ -391,7 +413,7 @@ describe('model catalog picker helpers', () => {
modelSource: 'fetched',
});
assert.deepEqual(
buildCatalogModelChoices(zenmux).map(({ id, source, isDefault }) => ({
buildConnectionModelCatalogEntries({ connection: zenmux }).map(({ id, source, isDefault }) => ({
id,
source,
isDefault,
Expand All@@ -401,36 +423,19 @@ describe('model catalog picker helpers', () => {
{ id: 'moonshotai/kimi-k2.7-code', source: 'provider_api', isDefault: false },
],
);
assert.deepEqual(buildCatalogChatModelChoices([zenmux]).map(choiceIdentity), [
assert.deepEqual(buildChatModelChoices([zenmux]).map(choiceIdentity), [
'zenmux:zenmux:moonshotai/kimi-k2.5',
'zenmux:zenmux:moonshotai/kimi-k2.7-code',
]);
assert.deepEqual(pickCatalogDefaultChatModel(zenmux), {
llmConnectionSlug: 'zenmux',
model: 'moonshotai/kimi-k2.5',
});
assert.deepEqual(
pickCatalogDefaultChatModel(
connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: ' gpt-4o-mini ',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
),
{ llmConnectionSlug: 'openai-api', model: 'gpt-4o-mini' },
);

const missingDefault = buildCatalogModelChoices(
connection({
const missingDefault = buildConnectionModelCatalogEntries({
connection: connection({
slug: 'openai-api',
providerType: 'openai',
defaultModel: 'gpt-5',
models: [{ id: 'gpt-4o-mini' }],
modelSource: 'fetched',
}),
);
});
assert.deepEqual(
missingDefault.map(({ id, availability, unavailableReason, isDefault }) => ({
id,
Expand All@@ -454,14 +459,14 @@ describe('model catalog picker helpers', () => {
],
);
assert.equal(
buildCatalogModelChoices(
connection({
buildConnectionModelCatalogEntries({
connection: connection({
slug: 'deepseek-api',
providerType: 'deepseek',
defaultModel: 'deepseek-v4-flash',
modelSource: 'fallback',
}),
).filter((choice) => choice.source === 'static_catalog').length,
}).filter((choice) => choice.source === 'static_catalog').length,
4,
);
});
Expand Down
81 changes: 81 additions & 0 deletions apps/desktop/src/main/__tests__/onboarding-service.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,24 @@ function realConnection(overrides: Partial<LlmConnection> = {}): LlmConnection {
} as LlmConnection;
}

function session(overrides: Partial<SessionSummary> = {}): SessionSummary {
return {
id: 's1',
name: 'Session',
isFlagged: false,
isArchived: false,
labels: [],
hasUnread: false,
status: 'active',
backend: 'ai-sdk',
llmConnectionSlug: 'a',
connectionLocked: true,
model: 'claude-sonnet-4-5-20250929',
permissionMode: 'ask',
...overrides,
};
}

function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingServiceDeps {
const milestones: OnboardingMilestone[] = [];
return {
Expand DownExpand Up@@ -72,6 +90,48 @@ function fakeDeps(overrides: Partial<OnboardingServiceDeps> = {}): OnboardingSer
}

describe('createOnboardingService.getSnapshot', () => {
it('pins the complete renderer projection for every physical session', async () => {
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [
session(),
session({ id: 's2', llmConnectionSlug: 'removed' }),
],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => true,
}));

const snapshot = await service.getSnapshot();
assert.deepEqual({
chatModelChoices: snapshot.chatModelChoices,
sessionSendOutcomes: snapshot.sessionSendOutcomes,
}, {
chatModelChoices: [{
connectionSlug: 'a',
providerType: 'anthropic',
providerLabel: 'Anthropic',
model: 'claude-sonnet-4-5-20250929',
label: 'Claude Sonnet 4.5',
connectionName: 'Anthropic Live',
isDefault: true,
thinkingLevels: ['off'],
}],
sessionSendOutcomes: {
s1: { kind: 'ready' },
s2: {
kind: 'blocked',
reason: 'connection_missing',
connectionLocked: true,
},
},
});
assert.deepEqual(
Object.keys(snapshot.sessionSendOutcomes).sort(),
snapshot.sessions.map((item) => item.id).sort(),
);
});

it('returns derived OnboardingState + sanitized milestones together', async () => {
const service = createOnboardingService(
fakeDeps({
Expand All@@ -86,6 +146,27 @@ describe('createOnboardingService.getSnapshot', () => {
assert.deepEqual(snapshot.milestones, [
{ id: 'first_chat_sent', completedAt: 1_700_000_000_000 },
]);
assert.equal(snapshot.chatModelChoices[0]?.providerLabel, 'Anthropic');
assert.equal(snapshot.chatModelChoices[0]?.isDefault, true);
});

it('projects session send readiness again after connection credentials change', async () => {
let hasCredential = true;
const service = createOnboardingService(fakeDeps({
listConnections: async () => [realConnection({ slug: 'a' })],
getDefaultSlug: async () => 'a',
listSessions: async () => [session()],
getMilestones: async () => [{ id: 'initial_onboarding', completedAt: 1 }],
hasCredential: async () => hasCredential,
}));

assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, { kind: 'ready' });
hasCredential = false;
assert.deepEqual((await service.getSnapshot()).sessionSendOutcomes.s1, {
kind: 'blocked',
reason: 'missing_api_key',
connectionLocked: true,
});
});

it('keeps physical revision summaries in the snapshot for version navigation', async () => {
Expand Down
Loading
Loading