diff --git a/src/frontend/config/sidebar/reference.topics.ts b/src/frontend/config/sidebar/reference.topics.ts
index 43d5b14a..24cb36e5 100644
--- a/src/frontend/config/sidebar/reference.topics.ts
+++ b/src/frontend/config/sidebar/reference.topics.ts
@@ -256,6 +256,10 @@ export const referenceTopics: StarlightSidebarTopicsUserConfig = {
               slug: 'reference/cli/commands/aspire-deploy',
             },
             { label: 'aspire do', slug: 'reference/cli/commands/aspire-do' },
+            {
+              label: 'aspire doctor',
+              slug: 'reference/cli/commands/aspire-doctor',
+            },
             { label: 'aspire exec', slug: 'reference/cli/commands/aspire-exec' },
             { label: 'aspire init', slug: 'reference/cli/commands/aspire-init' },
             {
diff --git a/src/frontend/src/content/docs/reference/cli/commands/aspire-doctor.mdx b/src/frontend/src/content/docs/reference/cli/commands/aspire-doctor.mdx
new file mode 100644
index 00000000..db003f0f
--- /dev/null
+++ b/src/frontend/src/content/docs/reference/cli/commands/aspire-doctor.mdx
@@ -0,0 +1,121 @@
+---
+title: aspire doctor command
+description: Learn about the aspire doctor command and its usage. This command checks the Aspire development environment for common issues.
+---
+
+import Include from '@components/Include.astro';
+import { Aside } from '@astrojs/starlight/components';
+
+## Name
+
+`aspire doctor` - Check the Aspire development environment for common issues.
+
+## Synopsis
+
+```bash title="Aspire CLI"
+aspire doctor [options]
+```
+
+## Description
+
+The `aspire doctor` command runs a series of diagnostic checks to verify that your development environment is properly configured for Aspire development. It checks prerequisites such as the .NET SDK, container runtime, and environment settings.
+
+This command is useful for troubleshooting when you encounter issues with Aspire or when setting up a new development environment. The checks are grouped by category:
+
+- **SDK checks**: Verifies .NET SDK installation and version requirements
+- **Container checks**: Validates container runtime (Docker/Podman) availability and configuration
+- **Environment checks**: Validates environment variables and other settings
+
+The command displays results with clear status indicators:
+
+- ✓ (green) - Check passed
+- ⚠ (yellow) - Warning (non-blocking issue)
+- ✗ (red) - Check failed (blocking issue)
+
+If any checks fail, the command provides suggestions for how to fix the issues and links to relevant documentation.
+
+## Options
+
+The following options are available:
+
+- **`--json`**
+
+  Outputs the check results in JSON format. This is useful for automation scenarios or when you need to parse the results programmatically.
+
+- <Include relativePath="reference/cli/includes/option-help.md" />
+
+- <Include relativePath="reference/cli/includes/option-debug.md" />
+
+- <Include relativePath="reference/cli/includes/option-wait.md" />
+
+## Examples
+
+- Run diagnostic checks on your development environment:
+
+  ```bash title="Aspire CLI"
+  aspire doctor
+  ```
+
+- Run diagnostic checks with JSON output:
+
+  ```bash title="Aspire CLI"
+  aspire doctor --json
+  ```
+
+## Sample output
+
+When you run `aspire doctor`, you see output similar to the following:
+
+```bash title="Aspire CLI"
+Environment Check
+=================
+
+SDK
+✓  .NET SDK 10.0.100 or later is installed
+✓  Aspire templates are available
+
+Container Runtime
+✓  Docker is installed and running
+✓  Docker Compose is available
+
+Environment
+✓  ASPNETCORE_ENVIRONMENT is set correctly
+
+Summary: 5 passed, 0 warnings, 0 failed
+```
+
+## Exit codes
+
+The command returns the following exit codes:
+
+| Exit code | Description                                       |
+| --------- | ------------------------------------------------- |
+| `0`       | All checks passed (warnings are allowed)          |
+| `1`       | One or more checks failed                         |
+
+## JSON output format
+
+When using the `--json` option, the output includes a structured response with all check results and a summary:
+
+```json
+{
+  "checks": [
+    {
+      "category": "sdk",
+      "message": ".NET SDK 10.0.100 or later is installed",
+      "status": "Pass"
+    }
+  ],
+  "summary": {
+    "passed": 5,
+    "warnings": 0,
+    "failed": 0
+  }
+}
+```
+
+## See also
+
+- [aspire command](../aspire/)
+- [aspire run command](../aspire-run/)
+- [Aspire CLI overview](../../overview/)
diff --git a/src/frontend/src/content/docs/reference/cli/commands/aspire.mdx b/src/frontend/src/content/docs/reference/cli/commands/aspire.mdx
index 866f43a9..0ee19f16 100644
--- a/src/frontend/src/content/docs/reference/cli/commands/aspire.mdx
+++ b/src/frontend/src/content/docs/reference/cli/commands/aspire.mdx
@@ -46,6 +46,7 @@ The following commands are available:
 | [`aspire config`](../aspire-config/)   | Stable  | Configures the Aspire environment.                                                 |
 | [`aspire deploy`](../aspire-deploy/)   | Preview | Deploys the artifacts created by `aspire publish`.                                 |
 | [`aspire do`](../aspire-do/)           | Preview | Execute a specific pipeline step and its dependencies.                             |
+| [`aspire doctor`](../aspire-doctor/)   | Stable  | Check the development environment for common issues.                               |
 | [`aspire exec`](../aspire-exec/)       | Preview | Similar to the `aspire run` command, but passes commands to the apphost.           |
 | [`aspire init`](../aspire-init/)       | Stable  | Initialize Aspire support in an existing solution or create a single-file AppHost. |
 | [`aspire mcp`](../aspire-mcp/)         | Stable  | Manage MCP (Model Context Protocol) server.                                        |