Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots πŸ“–

refactor: share the ai settings state and unify date formatting

Luis Ortiz70835d8feeec
diff --git a/AGENTS.md b/AGENTS.md
index 2aad923..86e2558 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -320,6 +320,25 @@ resolving a scancode against a keyboard layout is a local call with nothing to w
addon boundary when that flag is set, so a password never reaches our data even though UIAutomation
already withholds it.
+## Boundaries The Linter Holds
+
+`biome.json` covers `src`, `packages/core`, `packages/ui` and `apps/desktop`. `packages/ui` was
+missing from that list for a long time and nobody noticed, which is how forty-odd files reached it
+unchecked; adding it produced forty-one fixes on the first run.
+
+A `noRestrictedImports` override forbids anything under `packages/**` from importing `@/lib/*`,
+`@/ui/*`, `@/entrypoints/*`, `#imports` or any path through `apps/`. Shared code may never depend on
+an app. It is the rule that keeps `packages/ui` genuinely shared rather than quietly coupled to one
+surface, and it is also the licence seam: an MIT package that imports from a copyleft app is no
+longer MIT.
+
+One boundary the linter does **not** hold, and it bites: main-process code may only take `type`
+imports from `@mimik/core`. The renderer aliases the package to its source and bundles it, while
+`electron-vite`'s `externalizeDepsPlugin` leaves it external in main, so a value import resolves at
+runtime to a path with no file and the app dies on launch with `ERR_MODULE_NOT_FOUND`. That is why
+`capture/screenshot.ts` keeps its own three-line `clamp` rather than importing core's: deduplicating
+a one-liner is not worth a cross-boundary dependency that does not work.
+
## Which Client Is Running
`configureCore` carries a `client`, `extension` or `desktop`, and `client()` reads it back. Shared
diff --git a/apps/desktop/src/main/capture/screenshot-store.ts b/apps/desktop/src/main/capture/screenshot-store.ts
index f5c4f7a..f31e57d 100644
--- a/apps/desktop/src/main/capture/screenshot-store.ts
+++ b/apps/desktop/src/main/capture/screenshot-store.ts
@@ -21,10 +21,6 @@ export function writeScreenshot(id: string, png: Buffer): string {
return `${SCREENSHOT_SCHEME}://${id}`;
}
-export function deleteScreenshot(id: string): void {
- rmSync(fileFor(id), { force: true });
-}
-
export function sweepScreenshots(keep: readonly string[]): number {
const wanted = new Set(keep);
let removed = 0;
diff --git a/apps/desktop/src/main/capture/screenshot.ts b/apps/desktop/src/main/capture/screenshot.ts
index 9cc28f2..a645e98 100644
--- a/apps/desktop/src/main/capture/screenshot.ts
+++ b/apps/desktop/src/main/capture/screenshot.ts
@@ -1,6 +1,10 @@
import { screen } from 'electron';
import { Monitor } from 'node-screenshots';
+function clamp(value: number, min: number, max: number): number {
+ return Math.max(min, Math.min(max, value));
+}
+
export interface Capture {
png: Buffer;
width: number;
@@ -16,10 +20,6 @@ export interface Rect {
height: number;
}
-function clamp(value: number, min: number, max: number): number {
- return Math.max(min, Math.min(max, value));
-}
-
function monitorAt(x: number, y: number): Monitor {
const found = Monitor.fromPoint(Math.round(x), Math.round(y));
if (found) return found;
diff --git a/apps/desktop/src/renderer/SettingsPanel.tsx b/apps/desktop/src/renderer/SettingsPanel.tsx
index cd3f0ad..97d7172 100644
--- a/apps/desktop/src/renderer/SettingsPanel.tsx
+++ b/apps/desktop/src/renderer/SettingsPanel.tsx
@@ -1,5 +1,5 @@
import { validateApiKey } from '@mimik/core/capture/ai/validate';
-import { i18n, localStorage } from '@mimik/core/env';
+import { i18n } from '@mimik/core/env';
import AiSettings from '@mimik/ui/shared/AiSettings';
import { useKeyCheck } from '@mimik/ui/shared/key-status';
import { useEffect, useState } from 'react';
@@ -94,9 +94,7 @@ export default function SettingsPanel({ onClose }: { onClose(): void }) {
<div className="min-w-0 flex-1 overflow-y-auto px-10 py-8">
<div className="mx-auto flex max-w-[640px] flex-col gap-5">
- {section === 'ai' && (
- <AiSettings keyCheck={keyCheck} onChange={(patch) => void localStorage.set(patch as never)} />
- )}
+ {section === 'ai' && <AiSettings keyCheck={keyCheck} />}
{section === 'capture' && settings && (
<>
diff --git a/biome.json b/biome.json
index 246a730..59be6ec 100644
--- a/biome.json
+++ b/biome.json
@@ -64,5 +64,27 @@
"organizeImports": "on"
}
}
- }
+ },
+ "overrides": [
+ {
+ "includes": ["packages/**/*.ts", "packages/**/*.tsx"],
+ "linter": {
+ "rules": {
+ "style": {
+ "noRestrictedImports": {
+ "level": "error",
+ "options": {
+ "patterns": [
+ {
+ "group": ["@/lib/*", "@/ui/*", "@/entrypoints/*", "#imports", "**/apps/**"],
+ "message": "Shared packages must not import from an app. Move the code into the app, or the dependency the other way."
+ }
+ ]
+ }
+ }
+ }
+ }
+ }
+ }
+ ]
}
diff --git a/packages/core/src/export/utils.ts b/packages/core/src/export/utils.ts
index b09c6dd..5119371 100644
--- a/packages/core/src/export/utils.ts
+++ b/packages/core/src/export/utils.ts
@@ -72,7 +72,7 @@ export function formatDate(timestamp: number): string {
} catch {}
return new Date(timestamp).toLocaleDateString(locale, {
month: 'short',
- day: '2-digit',
+ day: 'numeric',
year: 'numeric',
});
}
diff --git a/packages/ui/src/lib/utils.ts b/packages/ui/src/lib/utils.ts
index b9611ef..f5edcbf 100644
--- a/packages/ui/src/lib/utils.ts
+++ b/packages/ui/src/lib/utils.ts
@@ -37,11 +37,7 @@ export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
-export function formatDate(ts: number): string {
- const locale = getDayjsLocale();
- const d = locale ? dayjs(ts).locale(locale) : dayjs(ts);
- return d.format('MMM D, YYYY');
-}
+export { formatDate } from '@mimik/core/export/utils';
export function formatDateShort(ts: number): string {
const locale = getDayjsLocale();
diff --git a/packages/ui/src/shared/AiSettings.tsx b/packages/ui/src/shared/AiSettings.tsx
index 5725a93..8ebcc9e 100644
--- a/packages/ui/src/shared/AiSettings.tsx
+++ b/packages/ui/src/shared/AiSettings.tsx
@@ -1,15 +1,6 @@
-import { type AIApiKeys, keyFor, migrateApiKeys, withKeyFor } from '@mimik/core/capture/ai/keys';
-import {
- AI_PROVIDERS,
- type AIProviderKey,
- CUSTOM_MODEL_VALUE,
- DEFAULT_AI_PROVIDER,
- isCustomBaseUrl,
- isCustomModel,
- providerOrDefault,
-} from '@mimik/core/capture/ai/models';
+import { AI_PROVIDERS, type AIProviderKey, CUSTOM_MODEL_VALUE } from '@mimik/core/capture/ai/models';
import { AI_LANGUAGES, type AILanguageCode } from '@mimik/core/capture/ai/prompts';
-import { i18n, localStorage } from '@mimik/core/env';
+import { i18n } from '@mimik/core/env';
import { Button } from '@mimik/ui/components/ui/button';
import { Input } from '@mimik/ui/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
@@ -21,8 +12,8 @@ import {
ModelList,
SecretInput,
} from '@mimik/ui/shared/key-status';
+import { useAiSettings } from '@mimik/ui/shared/use-ai-settings';
import { Globe, Sparkles, TriangleAlert } from 'lucide-react';
-import { useEffect, useState } from 'react';
export interface KeyCheck {
status: KeyStatus;
@@ -34,72 +25,31 @@ export interface KeyCheck {
interface AiSettingsProps {
keyCheck: KeyCheck;
- onChange(patch: Record<string, unknown>): void;
+ onChange?: (patch: Record<string, unknown>) => void;
}
export default function AiSettings({ keyCheck: aiKeyCheck, onChange }: AiSettingsProps) {
- const [provider, setProvider] = useState<AIProviderKey>(DEFAULT_AI_PROVIDER);
- const [model, setModel] = useState(AI_PROVIDERS[DEFAULT_AI_PROVIDER].defaultModel);
- const [apiKey, setApiKey] = useState('');
- const [apiKeys, setApiKeys] = useState<AIApiKeys>({});
- const [baseUrl, setBaseUrl] = useState('');
- const [customModel, setCustomModel] = useState(false);
- const [ownServer, setOwnServer] = useState(false);
- const [aiLanguage, setAiLanguage] = useState<AILanguageCode>('en');
-
- useEffect(() => {
- localStorage.get(['aiApiKey', 'aiApiKeys', 'aiProvider', 'aiModel', 'aiBaseUrl', 'aiLanguage']).then((result) => {
- const p = providerOrDefault(result.aiProvider);
- const keys = migrateApiKeys(result);
- setProvider(p);
- setApiKeys(keys);
- setApiKey(keyFor(keys, p));
- setModel((result.aiModel as string) || AI_PROVIDERS[p].defaultModel);
- if (isCustomBaseUrl(AI_PROVIDERS[p], result.aiBaseUrl as string)) {
- setBaseUrl(result.aiBaseUrl as string);
- setOwnServer(true);
- }
- if (result.aiLanguage) setAiLanguage(result.aiLanguage as AILanguageCode);
- });
- }, []);
-
- const handleProviderChange = (newProvider: AIProviderKey) => {
- setProvider(newProvider);
- setApiKey(keyFor(apiKeys, newProvider));
- aiKeyCheck.reset();
- setCustomModel(false);
- setModel(AI_PROVIDERS[newProvider].defaultModel);
- setOwnServer(false);
- setBaseUrl('');
- onChange({ aiProvider: newProvider, aiModel: AI_PROVIDERS[newProvider].defaultModel, aiBaseUrl: '' });
- };
-
- const handleOwnServerToggle = () => {
- setOwnServer((on) => {
- if (on) {
- setBaseUrl('');
- onChange({ aiBaseUrl: '' });
- }
- return !on;
- });
- aiKeyCheck.reset();
- };
-
- const handleModelChange = (value: string) => {
- if (value === CUSTOM_MODEL_VALUE) {
- setCustomModel(true);
- setModel('');
+ const {
+ provider,
+ model,
+ apiKey,
+ baseUrl,
+ language: aiLanguage,
+ ownServer,
+ usingCustomModel,
+ providerConfig,
+ setProvider: handleProviderChange,
+ setModel: handleModelChange,
+ setApiKey: handleApiKeyChange,
+ setBaseUrl: handleBaseUrlChange,
+ setLanguage: handleLanguageChange,
+ toggleOwnServer: handleOwnServerToggle,
+ } = useAiSettings({
+ onDirty: (patch) => {
aiKeyCheck.reset();
- return;
- }
- setCustomModel(false);
- setModel(value);
- aiKeyCheck.reset();
- onChange({ aiModel: value });
- };
-
- const providerConfig = AI_PROVIDERS[provider] ?? AI_PROVIDERS[DEFAULT_AI_PROVIDER];
- const usingCustomModel = customModel || isCustomModel(model, providerConfig);
+ onChange?.(patch);
+ },
+ });
return (
<div className="border border-border rounded-[10px] p-3.5 space-y-3">
@@ -143,11 +93,7 @@ export default function AiSettings({ keyCheck: aiKeyCheck, onChange }: AiSetting
{usingCustomModel && (
<Input
value={model}
- onChange={(e) => {
- setModel(e.target.value);
- onChange({ aiModel: e.target.value });
- aiKeyCheck.reset();
- }}
+ onChange={(e) => handleModelChange(e.target.value)}
placeholder={providerConfig.defaultModel}
aria-label={i18n.t('settings.modelCustom')}
className="mt-1.5 h-8 text-[13px] rounded-lg border-border"
@@ -160,15 +106,7 @@ export default function AiSettings({ keyCheck: aiKeyCheck, onChange }: AiSetting
<div className="flex items-center gap-1.5">
<SecretInput
value={apiKey}
- onChange={(next) => {
- setApiKey(next);
- setApiKeys((prev) => {
- const keys = withKeyFor(prev, provider, next);
- onChange({ aiApiKeys: keys, aiApiKey: next });
- return keys;
- });
- aiKeyCheck.reset();
- }}
+ onChange={handleApiKeyChange}
placeholder="sk-..."
className="h-8 text-[13px] rounded-lg border-border"
/>
@@ -223,10 +161,7 @@ export default function AiSettings({ keyCheck: aiKeyCheck, onChange }: AiSetting
<Input
type="text"
value={baseUrl}
- onChange={(e) => {
- setBaseUrl(e.target.value);
- aiKeyCheck.reset();
- }}
+ onChange={(e) => handleBaseUrlChange(e.target.value)}
placeholder={providerConfig.defaultBaseUrl}
aria-label={i18n.t('settings.baseUrl')}
className="h-8 text-[13px] rounded-lg border-border"
@@ -247,13 +182,7 @@ export default function AiSettings({ keyCheck: aiKeyCheck, onChange }: AiSetting
<Globe size={11} className="inline mr-1 -mt-px" />
{i18n.t('settings.aiLanguage')}
</label>
- <Select
- value={aiLanguage}
- onValueChange={(v) => {
- setAiLanguage(v as AILanguageCode);
- onChange({ aiLanguage: v });
- }}
- >
+ <Select value={aiLanguage} onValueChange={(v) => handleLanguageChange(v as AILanguageCode)}>
<SelectTrigger className="h-8">
<SelectValue />
</SelectTrigger>
diff --git a/packages/ui/src/shared/use-ai-settings.ts b/packages/ui/src/shared/use-ai-settings.ts
new file mode 100644
index 0000000..a53265d
--- /dev/null
+++ b/packages/ui/src/shared/use-ai-settings.ts
@@ -0,0 +1,165 @@
+import { type AIApiKeys, keyFor, migrateApiKeys, withKeyFor } from '@mimik/core/capture/ai/keys';
+import {
+ AI_PROVIDERS,
+ type AIProviderKey,
+ CUSTOM_MODEL_VALUE,
+ DEFAULT_AI_PROVIDER,
+ isCustomBaseUrl,
+ isCustomModel,
+ providerOrDefault,
+} from '@mimik/core/capture/ai/models';
+import type { AILanguageCode } from '@mimik/core/capture/ai/prompts';
+import { localStorage } from '@mimik/core/env';
+import { useCallback, useEffect, useState } from 'react';
+
+const AI_KEYS = ['aiProvider', 'aiModel', 'aiApiKey', 'aiApiKeys', 'aiBaseUrl', 'aiLanguage'] as const;
+
+export interface AiSettingsState {
+ provider: AIProviderKey;
+ model: string;
+ apiKey: string;
+ baseUrl: string;
+ language: AILanguageCode;
+ ownServer: boolean;
+ usingCustomModel: boolean;
+ providerConfig: (typeof AI_PROVIDERS)[AIProviderKey];
+ setProvider: (provider: AIProviderKey) => void;
+ setModel: (model: string) => void;
+ setApiKey: (apiKey: string) => void;
+ setBaseUrl: (baseUrl: string) => void;
+ setLanguage: (language: AILanguageCode) => void;
+ toggleOwnServer: () => void;
+}
+
+interface Options {
+ onDirty?: (patch: Record<string, unknown>) => void;
+ reloadOnFocus?: boolean;
+}
+
+export function useAiSettings({ onDirty, reloadOnFocus = false }: Options = {}): AiSettingsState {
+ const [provider, setProviderState] = useState<AIProviderKey>(DEFAULT_AI_PROVIDER);
+ const [model, setModelState] = useState(AI_PROVIDERS[DEFAULT_AI_PROVIDER].defaultModel);
+ const [apiKey, setApiKeyState] = useState('');
+ const [apiKeys, setApiKeys] = useState<AIApiKeys>({});
+ const [baseUrl, setBaseUrlState] = useState('');
+ const [language, setLanguageState] = useState<AILanguageCode>('en');
+ const [ownServer, setOwnServer] = useState(false);
+ const [customModel, setCustomModel] = useState(false);
+
+ useEffect(() => {
+ const load = () =>
+ localStorage.get(AI_KEYS).then((stored) => {
+ const next = providerOrDefault(stored.aiProvider);
+ const keys = migrateApiKeys(stored);
+ setProviderState(next);
+ setApiKeys(keys);
+ setApiKeyState(keyFor(keys, next));
+ if (typeof stored.aiModel === 'string') setModelState(stored.aiModel);
+ if (isCustomBaseUrl(AI_PROVIDERS[next], stored.aiBaseUrl as string)) {
+ setBaseUrlState(stored.aiBaseUrl as string);
+ setOwnServer(true);
+ }
+ if (typeof stored.aiLanguage === 'string') setLanguageState(stored.aiLanguage as AILanguageCode);
+ });
+
+ void load();
+ if (!reloadOnFocus) return;
+ const onVisible = () => {
+ if (document.visibilityState === 'visible') void load();
+ };
+ document.addEventListener('visibilitychange', onVisible);
+ return () => document.removeEventListener('visibilitychange', onVisible);
+ }, [reloadOnFocus]);
+
+ const dirty = useCallback(
+ (patch: Record<string, unknown>) => {
+ void localStorage.set(patch as never);
+ onDirty?.(patch);
+ },
+ [onDirty],
+ );
+
+ const setProvider = useCallback(
+ (next: AIProviderKey) => {
+ const nextModel = AI_PROVIDERS[next].defaultModel;
+ const nextKey = keyFor(apiKeys, next);
+ setProviderState(next);
+ setModelState(nextModel);
+ setApiKeyState(nextKey);
+ setCustomModel(false);
+ setOwnServer(false);
+ setBaseUrlState('');
+ dirty({ aiProvider: next, aiModel: nextModel, aiBaseUrl: '', aiApiKey: nextKey });
+ },
+ [apiKeys, dirty],
+ );
+
+ const setModel = useCallback(
+ (next: string) => {
+ if (next === CUSTOM_MODEL_VALUE) {
+ setCustomModel(true);
+ setModelState('');
+ return;
+ }
+ setCustomModel(false);
+ setModelState(next);
+ dirty({ aiModel: next });
+ },
+ [dirty],
+ );
+
+ const setApiKey = useCallback(
+ (next: string) => {
+ const keys = withKeyFor(apiKeys, provider, next);
+ setApiKeyState(next);
+ setApiKeys(keys);
+ dirty({ aiApiKey: next, aiApiKeys: keys });
+ },
+ [apiKeys, provider, dirty],
+ );
+
+ const setBaseUrl = useCallback(
+ (next: string) => {
+ setBaseUrlState(next);
+ dirty({ aiBaseUrl: next });
+ },
+ [dirty],
+ );
+
+ const setLanguage = useCallback(
+ (next: AILanguageCode) => {
+ setLanguageState(next);
+ dirty({ aiLanguage: next });
+ },
+ [dirty],
+ );
+
+ const toggleOwnServer = useCallback(() => {
+ setOwnServer((on) => {
+ if (on) {
+ setBaseUrlState('');
+ dirty({ aiBaseUrl: '' });
+ }
+ return !on;
+ });
+ }, [dirty]);
+
+ const providerConfig = AI_PROVIDERS[provider] ?? AI_PROVIDERS[DEFAULT_AI_PROVIDER];
+
+ return {
+ provider,
+ model,
+ apiKey,
+ baseUrl,
+ language,
+ ownServer,
+ usingCustomModel: customModel || isCustomModel(model, providerConfig),
+ providerConfig,
+ setProvider,
+ setModel,
+ setApiKey,
+ setBaseUrl,
+ setLanguage,
+ toggleOwnServer,
+ };
+}
diff --git a/src/ui/onboarding/App.tsx b/src/ui/onboarding/App.tsx
index e4f67f7..134ef7f 100644
--- a/src/ui/onboarding/App.tsx
+++ b/src/ui/onboarding/App.tsx
@@ -1,19 +1,11 @@
import { Input } from '@mimik/ui/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
+import { useAiSettings } from '@mimik/ui/shared/use-ai-settings';
import { Globe, Mic, MousePointerClick, Shield } from 'lucide-react';
import { useEffect, useState } from 'react';
import { browser, i18n } from '#imports';
import { PRESET_LABELS, type PresetKey } from '@/core/blur/regexes';
-import { type AIApiKeys, keyFor, migrateApiKeys, withKeyFor } from '@/core/capture/ai/keys';
-import {
- AI_PROVIDERS,
- type AIProviderKey,
- CUSTOM_MODEL_VALUE,
- DEFAULT_AI_PROVIDER,
- isCustomBaseUrl,
- isCustomModel,
- providerOrDefault,
-} from '@/core/capture/ai/models';
+import { AI_PROVIDERS, type AIProviderKey, CUSTOM_MODEL_VALUE } from '@/core/capture/ai/models';
import { AI_LANGUAGES, type AILanguageCode } from '@/core/capture/ai/prompts';
import type { VoiceProvider } from '@/core/capture/voice/transcribe';
import { localStorage, openSidebar, requestHostPermissions } from '@/lib/browser-api';
@@ -125,97 +117,24 @@ function WelcomeStep({ onNext }: { onNext: () => void }) {
}
function AISetupStep({ onNext, onSkip, onBack, index, total }: StepProps) {
- const [provider, setProvider] = useState<AIProviderKey>('openai');
- const [model, setModel] = useState(AI_PROVIDERS.openai.defaultModel);
- const [apiKey, setApiKey] = useState('');
- const [apiKeys, setApiKeys] = useState<AIApiKeys>({});
- const [baseUrl, setBaseUrl] = useState('');
- const [aiLanguage, setAiLanguage] = useState<AILanguageCode>('en');
- const [ownServer, setOwnServer] = useState(false);
- const [customModel, setCustomModel] = useState(false);
const aiKeyCheck = useKeyCheck();
-
- useEffect(() => {
- const load = () =>
- localStorage.get(['aiProvider', 'aiModel', 'aiApiKey', 'aiApiKeys', 'aiBaseUrl', 'aiLanguage']).then((stored) => {
- const key = providerOrDefault(stored.aiProvider);
- setProvider(key);
- if (typeof stored.aiModel === 'string') setModel(stored.aiModel);
- const keys = migrateApiKeys(stored);
- setApiKeys(keys);
- setApiKey(keyFor(keys, key));
- if (isCustomBaseUrl(AI_PROVIDERS[key], stored.aiBaseUrl as string)) {
- setBaseUrl(stored.aiBaseUrl as string);
- setOwnServer(true);
- }
- if (typeof stored.aiLanguage === 'string') setAiLanguage(stored.aiLanguage as AILanguageCode);
- });
-
- void load();
- const onVisible = () => {
- if (document.visibilityState === 'visible') void load();
- };
- document.addEventListener('visibilitychange', onVisible);
- return () => document.removeEventListener('visibilitychange', onVisible);
- }, []);
-
- const providerConfig = AI_PROVIDERS[provider] ?? AI_PROVIDERS[DEFAULT_AI_PROVIDER];
- const usingCustomModel = customModel || isCustomModel(model, providerConfig);
-
- const handleProviderChange = (newProvider: AIProviderKey) => {
- const nextModel = AI_PROVIDERS[newProvider].defaultModel;
- setProvider(newProvider);
- setModel(nextModel);
- setCustomModel(false);
- setOwnServer(false);
- setBaseUrl('');
- const nextKey = keyFor(apiKeys, newProvider);
- setApiKey(nextKey);
- aiKeyCheck.reset();
- void localStorage.set({ aiProvider: newProvider, aiModel: nextModel, aiBaseUrl: '', aiApiKey: nextKey });
- };
-
- const handleOwnServerToggle = () => {
- const next = !ownServer;
- setOwnServer(next);
- if (!next) {
- setBaseUrl('');
- void localStorage.set({ aiBaseUrl: '' });
- }
- aiKeyCheck.reset();
- };
-
- const handleModelChange = (nextModel: string) => {
- if (nextModel === CUSTOM_MODEL_VALUE) {
- setCustomModel(true);
- setModel('');
- aiKeyCheck.reset();
- return;
- }
- setCustomModel(false);
- setModel(nextModel);
- aiKeyCheck.reset();
- void localStorage.set({ aiModel: nextModel });
- };
-
- const handleApiKeyChange = (nextKey: string) => {
- setApiKey(nextKey);
- const nextKeys = withKeyFor(apiKeys, provider, nextKey);
- setApiKeys(nextKeys);
- aiKeyCheck.reset();
- void localStorage.set({ aiApiKey: nextKey, aiApiKeys: nextKeys });
- };
-
- const handleBaseUrlChange = (nextUrl: string) => {
- setBaseUrl(nextUrl);
- aiKeyCheck.reset();
- void localStorage.set({ aiBaseUrl: nextUrl });
- };
-
- const handleLanguageChange = (nextLanguage: AILanguageCode) => {
- setAiLanguage(nextLanguage);
- void localStorage.set({ aiLanguage: nextLanguage });
- };
+ const ai = useAiSettings({ onDirty: aiKeyCheck.reset, reloadOnFocus: true });
+ const {
+ provider,
+ model,
+ apiKey,
+ baseUrl,
+ language: aiLanguage,
+ ownServer,
+ usingCustomModel,
+ providerConfig,
+ setProvider: handleProviderChange,
+ setModel: handleModelChange,
+ setApiKey: handleApiKeyChange,
+ setBaseUrl: handleBaseUrlChange,
+ setLanguage: handleLanguageChange,
+ toggleOwnServer: handleOwnServerToggle,
+ } = ai;
return (
<div className="flex h-screen">
@@ -264,11 +183,7 @@ function AISetupStep({ onNext, onSkip, onBack, index, total }: StepProps) {
<Input
type="text"
value={model}
- onChange={(e) => {
- setModel(e.target.value);
- aiKeyCheck.reset();
- void localStorage.set({ aiModel: e.target.value });
- }}
+ onChange={(e) => handleModelChange(e.target.value)}
placeholder={providerConfig.defaultModel}
className="w-full mt-1.5 h-11 rounded-xl px-4 text-sm focus:border-accent focus:ring-accent/10"
/>
diff --git a/src/ui/onboarding/__tests__/settings-persist.test.tsx b/src/ui/onboarding/__tests__/settings-persist.test.tsx
index c2cfae2..1b3a1b1 100644
--- a/src/ui/onboarding/__tests__/settings-persist.test.tsx
+++ b/src/ui/onboarding/__tests__/settings-persist.test.tsx
@@ -20,8 +20,12 @@ vi.mock('@/lib/browser-api', () => ({
vi.mock('@/lib/offscreen', () => ({ openMicPermissionPage: vi.fn().mockResolvedValue(undefined) }));
+import { fakeBrowser } from 'wxt/testing';
import OnboardingApp from '../App';
+// the AI step persists through @mimik/core, which vitest.setup backs with fakeBrowser storage
+const aiStore = async () => (await fakeBrowser.storage.local.get('aiApiKey')).aiApiKey;
+
function press(label: string) {
fireEvent.click(screen.getAllByText(label)[0]);
}
@@ -39,8 +43,9 @@ function apiKeyField() {
return screen.getByPlaceholderText('sk-...') as HTMLInputElement;
}
-beforeEach(() => {
+beforeEach(async () => {
for (const key of Object.keys(store)) delete store[key];
+ await fakeBrowser.storage.local.clear();
});
describe('onboarding keeps what was typed', () => {
@@ -59,7 +64,7 @@ describe('onboarding keeps what was typed', () => {
fireEvent.change(apiKeyField(), { target: { value: 'sk-descriptions' } });
press('common.skip');
- await waitFor(() => expect(store.aiApiKey).toBe('sk-descriptions'));
+ await waitFor(async () => expect(await aiStore()).toBe('sk-descriptions'));
});
it('clears the narration key when the field is emptied', async () => {
@@ -73,13 +78,13 @@ describe('onboarding keeps what was typed', () => {
});
it('clears the description key when the field is emptied', async () => {
- store.aiApiKey = 'sk-old';
+ await fakeBrowser.storage.local.set({ aiApiKey: 'sk-old' });
await goToStep('onboarding.aiTitle');
await waitFor(() => expect(apiKeyField().value).toBe('sk-old'));
fireEvent.change(apiKeyField(), { target: { value: '' } });
- await waitFor(() => expect(store.aiApiKey).toBe(''));
+ await waitFor(async () => expect(await aiStore()).toBe(''));
});
it('picks up a key changed elsewhere when the tab comes back into view', async () => {
diff --git a/src/ui/shared/SettingsView.tsx b/src/ui/shared/SettingsView.tsx
index 659a9c8..8b922c8 100644
--- a/src/ui/shared/SettingsView.tsx
+++ b/src/ui/shared/SettingsView.tsx
@@ -121,12 +121,6 @@ export default function SettingsView({ onBack }: SettingsViewProps) {
brandAttribution,
};
- const queue = useCallback((patch: SettingsSnapshot) => {
- Object.assign(pending.current, patch);
- window.clearTimeout(saveTimer.current);
- saveTimer.current = window.setTimeout(() => void flushRef.current(), SAVE_DEBOUNCE_MS);
- }, []);
-
const flush = useCallback(async () => {
const patch = pending.current;
pending.current = {};
@@ -219,7 +213,6 @@ export default function SettingsView({ onBack }: SettingsViewProps) {
onChange={(patch) => {
if (typeof patch.aiProvider === 'string') setProvider(patch.aiProvider as AIProviderKey);
if (typeof patch.aiApiKey === 'string') setApiKey(patch.aiApiKey);
- queue(patch);
}}
/>