merge: integrate upstream main with local Makelore changes

This commit is contained in:
inman
2026-08-31 10:55:48 +08:00
128 changed files with 8278 additions and 3030 deletions

View File

@@ -5,7 +5,7 @@ import { MainLayout } from '@/components/layout/MainLayout';
import { codingWorkspaceStore } from '@/stores/coding-workspace';
import { useProjectConfigStore } from '@/stores/project-config';
import { useSettingsStore } from '@/stores/settings';
import { createProjectConfig } from '../../shared/project-config';
import { createCodingProjectConfigV2 } from '@electron/coding-projects/project-config';
const learningIpcMock = vi.hoisted(() => vi.fn());
@@ -57,7 +57,7 @@ describe('MainLayout module isolation', () => {
codingWorkspaceStore.setState({ activeProject: project });
useProjectConfigStore.setState({
configsByProjectId: {
[project.id]: { ...createProjectConfig(), initialized: false },
[project.id]: { ...createCodingProjectConfigV2(), initialized: false },
},
});
useSettingsStore.setState({ sidebarCollapsed: false });