diff --git a/apps/svelte.dev/content/docs/cli/10-introduction/10-overview.md b/apps/svelte.dev/content/docs/cli/10-introduction/10-overview.md
new file mode 100644
index 0000000000..9e4b22233e
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/10-introduction/10-overview.md
@@ -0,0 +1,19 @@
+---
+title: Overview
+---
+
+The command line interface (CLI), `sv`, is a toolkit for creating and maintaining Svelte applications.
+
+## Usage
+
+The easiest way to run `sv` is with [`npx`](https://docs.npmjs.com/cli/v8/commands/npx) (or the equivalent command if you're using a different package manager — for example, `pnpx` if you're using [pnpm](https://pnpm.io/)):
+
+```bash
+npx sv <command> <args>
+```
+
+If you're inside a project where `sv` is already installed, this will use the local installation, otherwise it will download the latest version and run it without installing it, which is particularly useful for [`sv create`](sv-create).
+
+## Acknowledgements
+
+Thank you to [Christopher Brown](https://github.com/chbrown) who originally owned the `sv` name on npm for graciously allowing it to be used for the Svelte CLI. You can find the original `sv` package at [`@chbrown/sv`](https://www.npmjs.com/package/@chbrown/sv).
diff --git a/apps/svelte.dev/content/docs/cli/10-introduction/index.md b/apps/svelte.dev/content/docs/cli/10-introduction/index.md
new file mode 100644
index 0000000000..8f14f7a7c9
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/10-introduction/index.md
@@ -0,0 +1,3 @@
+---
+title: Introduction
+---
diff --git a/apps/svelte.dev/content/docs/cli/20-commands/10-sv-create.md b/apps/svelte.dev/content/docs/cli/20-commands/10-sv-create.md
new file mode 100644
index 0000000000..36799f94ba
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/20-commands/10-sv-create.md
@@ -0,0 +1,55 @@
+---
+title: sv create
+---
+
+`sv create` sets up a new SvelteKit project, with options to [setup additional functionality](sv-add#Official-add-ons).
+
+## Usage
+
+```bash
+npx sv create [options] [path]
+```
+
+## Options
+
+<!-- TODO this flag should probably just be '--types', and the options should be 'ts' or 'jsdoc' -->
+
+### `--check-types <option>`
+
+Whether and how to add typechecking to the project:
+
+- `typescript` — default to `.ts` files and use `lang="ts"` for `.svelte` components
+- `checkjs` — use [JSDoc syntax](https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html) for types
+- `none` — no typechecking. Not recommended!
+
+### `--template <name>`
+
+Which project template to use:
+
+- `minimal` — barebones scaffolding for your new app
+- `demo` — showcase app with a word guessing game that works without JavaScript
+- `library` — template for a Svelte library, set up with `svelte-package`
+
+### `--no-integrations`
+
+<!-- TODO should be renamed to `--no-addons` -->
+
+Run the command without the interactive add-ons prompt
+
+### `--no-install`
+
+Skip dependency installation
+
+<!-- ## Programmatic interface
+
+```js
+// TODO: this gives type checking errors in the docs site when not commented out. Need to release sv, install it in the site, and uncomment this.
+// import { create } from 'sv';
+
+// // todo: check if this is right
+// create(cwd, {
+// 	// add your options here
+// 	// todo: list available option
+// });
+```
+-->
diff --git a/apps/svelte.dev/content/docs/cli/20-commands/20-sv-add.md b/apps/svelte.dev/content/docs/cli/20-commands/20-sv-add.md
new file mode 100644
index 0000000000..f6bdaeeb09
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/20-commands/20-sv-add.md
@@ -0,0 +1,39 @@
+---
+title: sv add
+---
+
+`sv add` updates an existing project with new functionality.
+
+## Usage
+
+```bash
+npx sv add
+```
+
+```bash
+npx sv add [add-ons]
+```
+
+You can select multiple space-separated add-ons from [the list below](#Official-add-ons), or you can use the interactive prompt.
+
+## Options
+
+- `-C`, `--cwd` — path to the root of your Svelte(Kit) project
+- `--no-preconditions` — skip checking preconditions <!-- TODO what does this mean? -->
+- `--no-install` — skip dependency installation
+
+## Official add-ons
+
+<!-- TODO this should be a separate section, each of these should have their own page -->
+
+- `drizzle`
+- `eslint`
+- `lucia`
+- `mdsvex`
+- `paraglide`
+- `playwright`
+- `prettier`
+- `routify`
+- `storybook`
+- `tailwindcss`
+- `vitest`
diff --git a/apps/svelte.dev/content/docs/cli/20-commands/30-sv-check.md b/apps/svelte.dev/content/docs/cli/20-commands/30-sv-check.md
new file mode 100644
index 0000000000..4ad025e0a1
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/20-commands/30-sv-check.md
@@ -0,0 +1,161 @@
+---
+title: sv check
+---
+
+`sv check` finds errors and warnings in your project, such as:
+
+- unused CSS
+- accessibility hints
+- JavaScript/TypeScript compiler errors
+
+Requires Node 16 or later.
+
+## Installation
+
+You will need to have the `svelte-check` package installed in your project:
+
+```bash
+npm i -D svelte-check
+```
+
+## Usage
+
+```bash
+npx sv check
+```
+
+## Options
+
+### `--workspace <path>`
+
+Path to your workspace. All subdirectories except `node_modules` and those listed in `--ignore` are checked.
+
+### `--output <format>`
+
+How to display errors and warnings. See [machine-readable output](#Machine-readable-output).
+
+- `human`
+- `human-verbose`
+- `machine`
+- `machine-verbose`
+
+### `--watch`
+
+Keeps the process alive and watches for changes.
+
+### `--preserveWatchOutput`
+
+Prevents the screen from being cleared in watch mode.
+
+### `--tsconfig <path>`
+
+Pass a path to a `tsconfig` or `jsconfig` file. The path can be relative to the workspace path or absolute. Doing this means that only files matched by the `files`/`include`/`exclude` pattern of the config file are diagnosed. It also means that errors from TypeScript and JavaScript files are reported. If not given, will traverse upwards from the project directory looking for the next `jsconfig`/`tsconfig.json` file.
+
+### `--no-tsconfig`
+
+Use this if you only want to check the Svelte files found in the current directory and below and ignore any `.js`/`.ts` files (they will not be type-checked)
+
+### `--ignore <paths>`
+
+Files/folders to ignore, relative to workspace root. Paths should be comma-separated and quoted. Example:
+
+```bash
+npx sv check --ignore "dist,build"
+```
+
+<!-- TODO what the hell does this mean? is it possible to use --tsconfig AND --no-tsconfig? if so what would THAT mean? -->
+
+Only has an effect when used in conjunction with `--no-tsconfig`. When used in conjunction with `--tsconfig`, this will only have effect on the files watched, not on the files that are diagnosed, which is then determined by the `tsconfig.json`.
+
+### `--fail-on-warnings`
+
+If provided, warnings will cause `sv check` to exit with an error code.
+
+### `--compiler-warnings <warnings>`
+
+A quoted, comma-separated list of `code:behaviour` pairs where `code` is a [compiler warning code](../svelte/compiler-warnings) and `behaviour` is either `ignore` or `error`:
+
+```bash
+npx sv check --compiler-warnings "css_unused_selector:ignore,a11y_missing_attribute:error"
+```
+
+### `--diagnostic-sources <sources>`
+
+A quoted, comma-separated list of sources that should run diagnostics on your code. By default, all are active:
+
+<!-- TODO would be nice to have a clearer definition of what these are -->
+- `js` (includes TypeScript)
+- `svelte`
+- `css`
+
+Example:
+
+```bash
+npx sv check --diagnostic-sources "js,svelte"
+```
+
+### `--threshold <level>`
+
+Filters the diagnostics:
+
+- `warning` (default) — both errors and warnings are shown
+- `error` — only errors are shown
+
+## Troubleshooting
+
+[See the language-tools documentation](https://github.com/sveltejs/language-tools/blob/master/docs/README.md) for more information on preprocessor setup and other troubleshooting.
+
+## Machine-readable output
+
+Setting the `--output` to `machine` or `machine-verbose` will format output in a way that is easier to read
+by machines, e.g. inside CI pipelines, for code quality checks, etc.
+
+Each row corresponds to a new record. Rows are made up of columns that are separated by a
+single space character. The first column of every row contains a timestamp in milliseconds
+which can be used for monitoring purposes. The second column gives us the "row type", based
+on which the number and types of subsequent columns may differ.
+
+The first row is of type `START` and contains the workspace folder (wrapped in quotes). Example:
+
+```
+1590680325583 START "/home/user/language-tools/packages/language-server/test/plugins/typescript/testfiles"
+```
+
+Any number of `ERROR` or `WARNING` records may follow. Their structure is identical and depends on the output argoument.
+
+If the argument is `machine` it will tell us the filename, the starting line and column numbers, and the error message. The filename is relative to the workspace directory. The filename and the message are both wrapped in quotes. Example:
+
+```
+1590680326283 ERROR "codeactions.svelte" 1:16 "Cannot find module 'blubb' or its corresponding type declarations."
+1590680326778 WARNING "imported-file.svelte" 0:37 "Component has unused export property 'prop'. If it is for external reference only, please consider using `export const prop`"
+```
+
+If the argument is `machine-verbose` it will tell us the filename, the starting line and column numbers, the ending line and column numbers, the error message, the code of diagnostic, the human-friendly description of the code and the human-friendly source of the diagnostic (eg. svelte/typescript). The filename is relative to the workspace directory. Each diagnostic is represented as an [ndjson](https://en.wikipedia.org/wiki/JSON_streaming#Newline-Delimited_JSON) line prefixed by the timestamp of the log. Example:
+
+```
+1590680326283 {"type":"ERROR","fn":"codeaction.svelte","start":{"line":1,"character":16},"end":{"line":1,"character":23},"message":"Cannot find module 'blubb' or its corresponding type declarations.","code":2307,"source":"js"}
+1590680326778 {"type":"WARNING","filename":"imported-file.svelte","start":{"line":0,"character":37},"end":{"line":0,"character":51},"message":"Component has unused export property 'prop'. If it is for external reference only, please consider using `export
+const prop`","code":"unused-export-let","source":"svelte"}
+```
+
+The output concludes with a `COMPLETED` message that summarizes total numbers of files, errors and warnings that were encountered during the check. Example:
+
+```
+1590680326807 COMPLETED 20 FILES 21 ERRORS 1 WARNINGS 3 FILES_WITH_PROBLEMS
+```
+
+If the application experiences a runtime error, this error will appear as a `FAILURE` record. Example:
+
+```
+1590680328921 FAILURE "Connection closed"
+```
+
+## Credits
+
+- Vue's [VTI](https://github.com/vuejs/vetur/tree/master/vti) which laid the foundation for `svelte-check`
+
+## FAQ
+
+### Why is there no option to only check specific files (for example only staged files)?
+
+`svelte-check` needs to 'see' the whole project for checks to be valid. Suppose you renamed a component prop but didn't update any of the places where the prop is used — the usage sites are all errors now, but you would miss them if checks only ran on changed files.
diff --git a/apps/svelte.dev/content/docs/cli/20-commands/40-sv-migrate.md b/apps/svelte.dev/content/docs/cli/20-commands/40-sv-migrate.md
new file mode 100644
index 0000000000..8db5eb3b16
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/20-commands/40-sv-migrate.md
@@ -0,0 +1,35 @@
+---
+title: sv migrate
+---
+
+`sv migrate` migrates Svelte(Kit) codebases. It delegates to the [`svelte-migrate`](https://github.com/sveltejs/kit/blob/main/packages/migrate) package.
+
+Some migrations may annotate your codebase with tasks for completion that you can find by searching for `@migration`.
+
+## Usage
+
+```bash
+npx sv migrate [migration]
+```
+
+## Migrations
+
+### `svelte-5`
+
+Upgrades a Svelte 4 app to use Svelte 5, and updates individual components to use [runes](../svelte/what-are-runes) and other Svelte 5 syntax ([see migration guide](../svelte/v5-migration-guide)).
+
+### `svelte-4`
+
+Upgrades a Svelte 3 app to use Svelte 4 ([see migration guide](../svelte/v4-migration-guide)).
+
+### `sveltekit-2`
+
+Upgrades a SvelteKit 1 app to SvelteKit 2 ([see migration guide](../kit/migrating-to-sveltekit-2)).
+
+### `package`
+
+Upgrades a library using `@sveltejs/package` version 1 to version 2. See the [pull request](https://github.com/sveltejs/kit/pull/8922) for more details.
+
+### `routes`
+
+Upgrades a pre-release SvelteKit app to use the filesystem routing conventions in SvelteKit 1. See the [pull request](https://github.com/sveltejs/kit/discussions/5774) for more details.
diff --git a/apps/svelte.dev/content/docs/cli/20-commands/index.md b/apps/svelte.dev/content/docs/cli/20-commands/index.md
new file mode 100644
index 0000000000..877406c009
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/20-commands/index.md
@@ -0,0 +1,3 @@
+---
+title: Commands
+---
diff --git a/apps/svelte.dev/content/docs/cli/index.md b/apps/svelte.dev/content/docs/cli/index.md
new file mode 100644
index 0000000000..5f81cc866a
--- /dev/null
+++ b/apps/svelte.dev/content/docs/cli/index.md
@@ -0,0 +1,3 @@
+---
+title: CLI
+---
diff --git a/apps/svelte.dev/scripts/sync-docs/index.ts b/apps/svelte.dev/scripts/sync-docs/index.ts
index 03e6270223..c40e37c674 100644
--- a/apps/svelte.dev/scripts/sync-docs/index.ts
+++ b/apps/svelte.dev/scripts/sync-docs/index.ts
@@ -11,12 +11,12 @@ import type { Modules } from '@sveltejs/site-kit/markdown';
 
 interface Package {
 	name: string;
-	local: string;
 	repo: string;
 	branch: string;
 	pkg: string;
 	docs: string;
-	process_modules: (modules: Modules, pkg: Package) => Promise<Modules>;
+	types: string | null;
+	process_modules?: (modules: Modules, pkg: Package) => Promise<Modules>;
 }
 
 const dirname = fileURLToPath(new URL('.', import.meta.url));
@@ -26,11 +26,11 @@ const DOCS = path.join(dirname, '../../content/docs');
 const packages: Package[] = [
 	{
 		name: 'svelte',
-		local: `${REPOS}/svelte`,
 		repo: 'sveltejs/svelte',
 		branch: 'main',
 		pkg: 'packages/svelte',
 		docs: 'documentation/docs',
+		types: 'types',
 		process_modules: async (modules: Modules) => {
 			// Remove $$_attributes from ActionReturn
 			const module_with_ActionReturn = modules.find((m) =>
@@ -50,13 +50,13 @@ const packages: Package[] = [
 	},
 	{
 		name: 'kit',
-		local: `${REPOS}/kit`,
 		repo: 'sveltejs/kit',
 		branch: 'main',
 		pkg: 'packages/kit',
 		docs: 'documentation/docs',
+		types: 'types',
 		process_modules: async (modules, pkg) => {
-			const kit_base = `${pkg.local}/${pkg.pkg}/`;
+			const kit_base = `${REPOS}/${pkg.name}/${pkg.pkg}/`;
 
 			{
 				const code = read_d_ts_file(kit_base + 'src/types/private.d.ts');
@@ -107,6 +107,14 @@ const packages: Package[] = [
 
 			return modules;
 		}
+	},
+	{
+		name: 'cli',
+		repo: 'sveltejs/cli',
+		branch: 'chore/add-docs',
+		pkg: 'packages/cli',
+		docs: 'documentation/docs',
+		types: null
 	}
 ];
 
@@ -132,14 +140,17 @@ async function sync(pkg: Package) {
 	const dest = `${DOCS}/${pkg.name}`;
 
 	fs.rmSync(dest, { force: true, recursive: true });
-	fs.cpSync(`${pkg.local}/${pkg.docs}`, dest, { recursive: true });
+	fs.cpSync(`${REPOS}/${pkg.name}/${pkg.docs}`, dest, { recursive: true });
 	migrate_meta_json(dest);
 
-	const modules = await pkg.process_modules(await read_types(`${pkg.local}/${pkg.pkg}/`, []), pkg);
+	let modules: Modules = [];
 
-	const files = glob(`${dest}/**/*.md`);
+	if (pkg.types !== null) {
+		modules = await read_types(`${REPOS}/${pkg.name}/${pkg.pkg}/${pkg.types}/`, []);
+		await pkg.process_modules?.(modules, pkg);
+	}
 
-	for (const file of files) {
+	for (const file of glob(`${dest}/**/*.md`)) {
 		const content = await preprocess(file, modules);
 
 		fs.writeFileSync(file, content);
diff --git a/apps/svelte.dev/scripts/sync-docs/types.ts b/apps/svelte.dev/scripts/sync-docs/types.ts
index f07b24b7ae..2e7f054d75 100644
--- a/apps/svelte.dev/scripts/sync-docs/types.ts
+++ b/apps/svelte.dev/scripts/sync-docs/types.ts
@@ -11,7 +11,7 @@ export async function read_types(base: string, modules: Modules) {
 			'svelte/types/compiler/preprocess', // legacy entrypoint
 			'svelte/types/compiler/interfaces' // legacy entrypoint
 		];
-		const code = read_d_ts_file(base + 'types/index.d.ts');
+		const code = read_d_ts_file(base + 'index.d.ts');
 		const node = ts.createSourceFile('index.d.ts', code, ts.ScriptTarget.Latest, true);
 
 		for (const statement of node.statements) {
diff --git a/apps/svelte.dev/src/routes/+layout.server.ts b/apps/svelte.dev/src/routes/+layout.server.ts
index 14a93383c4..cedf974eec 100644
--- a/apps/svelte.dev/src/routes/+layout.server.ts
+++ b/apps/svelte.dev/src/routes/+layout.server.ts
@@ -5,8 +5,8 @@ const nav_links: NavigationLink[] = [
 	{
 		title: 'Docs',
 		slug: 'docs',
-		sections: Object.values(docs.topics)
-			.map((topic) => ({
+		sections: [docs.topics['docs/svelte'], docs.topics['docs/kit'], docs.topics['docs/cli']].map(
+			(topic) => ({
 				title: topic.metadata.title,
 				path: '/' + topic.slug, // this will make the UI show a flyout menu for the docs nav entry
 				sections: topic.children.map((section) => ({
@@ -16,8 +16,8 @@ const nav_links: NavigationLink[] = [
 						path: '/' + page.slug
 					}))
 				}))
-			}))
-			.sort((a, b) => a.title.localeCompare(b.title)) // Svelte first
+			})
+		)
 	},
 	{
 		title: 'Tutorial',